From c7e7de746e9594b609b4c5142ec8a69f0c9d45e5 Mon Sep 17 00:00:00 2001 From: AFutureWebDev Date: Sun, 4 Aug 2019 01:08:26 -0500 Subject: [PATCH 1/4] initial commit --- package-lock.json | 171 ++++++++++++---------------------------- package.json | 2 + routes/messagesRoute.js | 2 + routes/ordersRoute.js | 2 + routes/tasksRoute.js | 5 ++ server/index.js | 8 ++ 6 files changed, 68 insertions(+), 122 deletions(-) create mode 100644 routes/messagesRoute.js create mode 100644 routes/ordersRoute.js create mode 100644 routes/tasksRoute.js diff --git a/package-lock.json b/package-lock.json index 87202ad..4c5a16c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1787,7 +1787,6 @@ "version": "1.3.7", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", - "dev": true, "requires": { "mime-types": "~2.1.24", "negotiator": "0.6.2" @@ -2657,7 +2656,6 @@ "version": "1.19.0", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==", - "dev": true, "requires": { "bytes": "3.1.0", "content-type": "~1.0.4", @@ -2674,14 +2672,12 @@ "bytes": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", - "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==", - "dev": true + "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==" }, "debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, "requires": { "ms": "2.0.0" } @@ -2689,14 +2685,12 @@ "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, "qs": { "version": "6.7.0", "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", - "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==", - "dev": true + "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==" } } }, @@ -3944,7 +3938,6 @@ "version": "0.5.3", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz", "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==", - "dev": true, "requires": { "safe-buffer": "5.1.2" } @@ -3952,8 +3945,7 @@ "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==", - "dev": true + "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==" }, "convert-source-map": { "version": "1.6.0", @@ -3967,14 +3959,12 @@ "cookie": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz", - "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==", - "dev": true + "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==" }, "cookie-signature": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=", - "dev": true + "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" }, "copy-concurrently": { "version": "1.0.5", @@ -4579,8 +4569,7 @@ "depd": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", - "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=", - "dev": true + "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=" }, "des.js": { "version": "1.0.0", @@ -4595,8 +4584,7 @@ "destroy": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", - "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=", - "dev": true + "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" }, "detect-newline": { "version": "2.1.0", @@ -4809,8 +4797,7 @@ "ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=", - "dev": true + "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" }, "electron-to-chromium": { "version": "1.3.201", @@ -4848,8 +4835,7 @@ "encodeurl": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=", - "dev": true + "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=" }, "end-of-stream": { "version": "1.4.1", @@ -4923,8 +4909,7 @@ "escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=", - "dev": true + "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" }, "escape-string-regexp": { "version": "1.0.5", @@ -5433,8 +5418,7 @@ "etag": { "version": "1.8.1", "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=", - "dev": true + "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" }, "eventemitter3": { "version": "3.1.2", @@ -5562,7 +5546,6 @@ "version": "4.17.1", "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz", "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==", - "dev": true, "requires": { "accepts": "~1.3.7", "array-flatten": "1.1.1", @@ -5599,14 +5582,12 @@ "array-flatten": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=", - "dev": true + "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" }, "debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, "requires": { "ms": "2.0.0" } @@ -5614,14 +5595,12 @@ "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, "qs": { "version": "6.7.0", "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", - "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==", - "dev": true + "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==" } } }, @@ -5857,7 +5836,6 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==", - "dev": true, "requires": { "debug": "2.6.9", "encodeurl": "~1.0.2", @@ -5872,7 +5850,6 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, "requires": { "ms": "2.0.0" } @@ -5880,8 +5857,7 @@ "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" } } }, @@ -6017,8 +5993,7 @@ "forwarded": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", - "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=", - "dev": true + "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=" }, "fragment-cache": { "version": "0.2.1", @@ -6032,8 +6007,7 @@ "fresh": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=", - "dev": true + "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" }, "from2": { "version": "2.3.0", @@ -6541,7 +6515,6 @@ "version": "1.7.2", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==", - "dev": true, "requires": { "depd": "~1.1.2", "inherits": "2.0.3", @@ -6553,8 +6526,7 @@ "inherits": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" } } }, @@ -6608,7 +6580,6 @@ "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dev": true, "requires": { "safer-buffer": ">= 2.1.2 < 3" } @@ -6811,8 +6782,7 @@ "ipaddr.js": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz", - "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==", - "dev": true + "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==" }, "is-absolute-url": { "version": "2.1.0", @@ -7436,8 +7406,7 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", @@ -7480,8 +7449,7 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", @@ -7492,8 +7460,7 @@ "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -7610,8 +7577,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -7623,7 +7589,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -7646,14 +7611,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -7672,7 +7635,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -7753,8 +7715,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -7766,7 +7727,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -7852,8 +7812,7 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -7889,7 +7848,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -7909,7 +7867,6 @@ "version": "3.0.1", "bundled": true, "dev": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -7953,14 +7910,12 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true } } } @@ -8830,8 +8785,7 @@ "media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=", - "dev": true + "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" }, "mem": { "version": "4.3.0", @@ -8876,8 +8830,7 @@ "merge-descriptors": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=", - "dev": true + "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=" }, "merge-stream": { "version": "1.0.1", @@ -8897,8 +8850,7 @@ "methods": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=", - "dev": true + "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=" }, "microevent.ts": { "version": "0.1.1", @@ -8954,14 +8906,12 @@ "mime-db": { "version": "1.40.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz", - "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==", - "dev": true + "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==" }, "mime-types": { "version": "2.1.24", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz", "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==", - "dev": true, "requires": { "mime-db": "1.40.0" } @@ -9169,8 +9119,7 @@ "negotiator": { "version": "0.6.2", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", - "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==", - "dev": true + "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==" }, "neo-async": { "version": "2.6.1", @@ -9484,7 +9433,6 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", - "dev": true, "requires": { "ee-first": "1.1.1" } @@ -9741,8 +9689,7 @@ "parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", - "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", - "dev": true + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==" }, "pascalcase": { "version": "0.1.1", @@ -9795,8 +9742,7 @@ "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=", - "dev": true + "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" }, "path-type": { "version": "3.0.0", @@ -10980,7 +10926,6 @@ "version": "2.0.5", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz", "integrity": "sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==", - "dev": true, "requires": { "forwarded": "~0.1.2", "ipaddr.js": "1.9.0" @@ -11112,14 +11057,12 @@ "range-parser": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", - "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", - "dev": true + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" }, "raw-body": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz", "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==", - "dev": true, "requires": { "bytes": "3.1.0", "http-errors": "1.7.2", @@ -11130,8 +11073,7 @@ "bytes": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", - "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==", - "dev": true + "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==" } } }, @@ -11775,8 +11717,7 @@ "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, "safe-regex": { "version": "1.1.0", @@ -11790,8 +11731,7 @@ "safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "sane": { "version": "4.1.0", @@ -11938,7 +11878,6 @@ "version": "0.17.1", "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz", "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==", - "dev": true, "requires": { "debug": "2.6.9", "depd": "~1.1.2", @@ -11959,7 +11898,6 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, "requires": { "ms": "2.0.0" }, @@ -11967,22 +11905,19 @@ "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" } } }, "mime": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", - "dev": true + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" }, "ms": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", - "dev": true + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" } } }, @@ -12052,7 +11987,6 @@ "version": "1.14.1", "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz", "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==", - "dev": true, "requires": { "encodeurl": "~1.0.2", "escape-html": "~1.0.3", @@ -12098,8 +12032,7 @@ "setprototypeof": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", - "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==", - "dev": true + "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" }, "sha.js": { "version": "2.4.11", @@ -12580,8 +12513,7 @@ "statuses": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", - "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=", - "dev": true + "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" }, "stealthy-require": { "version": "1.1.1", @@ -12992,8 +12924,7 @@ "toidentifier": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", - "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==", - "dev": true + "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==" }, "tough-cookie": { "version": "2.5.0", @@ -13075,7 +13006,6 @@ "version": "1.6.18", "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", - "dev": true, "requires": { "media-typer": "0.3.0", "mime-types": "~2.1.24" @@ -13190,8 +13120,7 @@ "unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=", - "dev": true + "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=" }, "unquote": { "version": "1.1.1", @@ -13353,8 +13282,7 @@ "utils-merge": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", - "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=", - "dev": true + "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=" }, "uuid": { "version": "3.3.2", @@ -13375,8 +13303,7 @@ "vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", - "dev": true + "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" }, "vendors": { "version": "1.0.3", diff --git a/package.json b/package.json index 7b82fba..bac423e 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,8 @@ "react-scripts": "*" }, "dependencies": { + "body-parser": "^1.19.0", + "express": "^4.17.1", "prop-types": "*", "react": "*", "react-dom": "*" diff --git a/routes/messagesRoute.js b/routes/messagesRoute.js new file mode 100644 index 0000000..3041bed --- /dev/null +++ b/routes/messagesRoute.js @@ -0,0 +1,2 @@ +const express = require("express"); +const router = express.Router(); \ No newline at end of file diff --git a/routes/ordersRoute.js b/routes/ordersRoute.js new file mode 100644 index 0000000..3041bed --- /dev/null +++ b/routes/ordersRoute.js @@ -0,0 +1,2 @@ +const express = require("express"); +const router = express.Router(); \ No newline at end of file diff --git a/routes/tasksRoute.js b/routes/tasksRoute.js new file mode 100644 index 0000000..882fa5f --- /dev/null +++ b/routes/tasksRoute.js @@ -0,0 +1,5 @@ +const express = require("express"); +const router = express.Router(); + + +router.get() \ No newline at end of file diff --git a/server/index.js b/server/index.js index e69de29..bab6587 100644 --- a/server/index.js +++ b/server/index.js @@ -0,0 +1,8 @@ +let express = require("express"); +let bodyParser = require("body-parser"); + +let app = express(); +app.use(bodyParser.json()); +app.use(express.static("public")); + +app.listen(3000) \ No newline at end of file From 557ac668cc247def45e92d1ef30751ff7694b5e6 Mon Sep 17 00:00:00 2001 From: AFutureWebDev Date: Sun, 4 Aug 2019 11:30:44 -0500 Subject: [PATCH 2/4] added new routes --- routes/dateTimeRoute.js | 2 ++ routes/newCommentsRoute.js | 2 ++ routes/newOrdersRoute.js | 2 ++ routes/newTasksRoute.js | 2 ++ routes/ticketsRoute.js | 2 ++ 5 files changed, 10 insertions(+) create mode 100644 routes/dateTimeRoute.js create mode 100644 routes/newCommentsRoute.js create mode 100644 routes/newOrdersRoute.js create mode 100644 routes/newTasksRoute.js create mode 100644 routes/ticketsRoute.js diff --git a/routes/dateTimeRoute.js b/routes/dateTimeRoute.js new file mode 100644 index 0000000..3041bed --- /dev/null +++ b/routes/dateTimeRoute.js @@ -0,0 +1,2 @@ +const express = require("express"); +const router = express.Router(); \ No newline at end of file diff --git a/routes/newCommentsRoute.js b/routes/newCommentsRoute.js new file mode 100644 index 0000000..3041bed --- /dev/null +++ b/routes/newCommentsRoute.js @@ -0,0 +1,2 @@ +const express = require("express"); +const router = express.Router(); \ No newline at end of file diff --git a/routes/newOrdersRoute.js b/routes/newOrdersRoute.js new file mode 100644 index 0000000..3041bed --- /dev/null +++ b/routes/newOrdersRoute.js @@ -0,0 +1,2 @@ +const express = require("express"); +const router = express.Router(); \ No newline at end of file diff --git a/routes/newTasksRoute.js b/routes/newTasksRoute.js new file mode 100644 index 0000000..3041bed --- /dev/null +++ b/routes/newTasksRoute.js @@ -0,0 +1,2 @@ +const express = require("express"); +const router = express.Router(); \ No newline at end of file diff --git a/routes/ticketsRoute.js b/routes/ticketsRoute.js new file mode 100644 index 0000000..3041bed --- /dev/null +++ b/routes/ticketsRoute.js @@ -0,0 +1,2 @@ +const express = require("express"); +const router = express.Router(); \ No newline at end of file From 8a6a0e90204ac42ee12efa12a75386e584f12315 Mon Sep 17 00:00:00 2001 From: AFutureWebDev Date: Sun, 4 Aug 2019 13:19:27 -0500 Subject: [PATCH 3/4] almost there --- controllers/dataController.js | 0 controllers/messagesController.js | 25 ++++ controllers/ordersController.js | 30 +++++ controllers/tasksController.js | 26 ++++ models/MessageModel.js | 12 ++ models/OrderModel.js | 12 ++ models/TaskModels.js | 11 ++ package-lock.json | 196 +++++++++++++++++++++++++++++- package.json | 2 + routes/dataRoute.js | 38 ++++++ routes/dateTimeRoute.js | 2 - routes/foxRoute.js | 0 routes/messagesRoute.js | 11 +- routes/newCommentsRoute.js | 2 - routes/newOrdersRoute.js | 2 - routes/newTasksRoute.js | 2 - routes/ordersRoute.js | 11 +- routes/tasksRoute.js | 8 +- routes/ticketsRoute.js | 2 - server/index.js | 15 ++- 20 files changed, 387 insertions(+), 20 deletions(-) create mode 100644 controllers/dataController.js create mode 100644 controllers/messagesController.js create mode 100644 controllers/ordersController.js create mode 100644 controllers/tasksController.js create mode 100644 models/MessageModel.js create mode 100644 models/OrderModel.js create mode 100644 models/TaskModels.js create mode 100644 routes/dataRoute.js delete mode 100644 routes/dateTimeRoute.js create mode 100644 routes/foxRoute.js delete mode 100644 routes/newCommentsRoute.js delete mode 100644 routes/newOrdersRoute.js delete mode 100644 routes/newTasksRoute.js delete mode 100644 routes/ticketsRoute.js diff --git a/controllers/dataController.js b/controllers/dataController.js new file mode 100644 index 0000000..e69de29 diff --git a/controllers/messagesController.js b/controllers/messagesController.js new file mode 100644 index 0000000..66ab45e --- /dev/null +++ b/controllers/messagesController.js @@ -0,0 +1,25 @@ +let MessageModel = require("../models/MessageModel"); + +// get - returns all vehicles +exports.list = function list(request, response) { + MessageModel.find(function (err, message) { + if (err) return console.error(err); + return response.json(message); + }) +} + +// get one vehicle by id +exports.show = function show(request, response) { + MessageModel.findById(request.params.id, function (err, message){ + if (err) return console.error(err); + return response.json(message); + }) +} + +// post +exports.create = function create(request, response) { + const newMessage = new MessageModel(request.body); + newMessage.save((err, message) => { + response.json(message); + }); +} \ No newline at end of file diff --git a/controllers/ordersController.js b/controllers/ordersController.js new file mode 100644 index 0000000..baef6ac --- /dev/null +++ b/controllers/ordersController.js @@ -0,0 +1,30 @@ +let OrderModel = require("../models/OrderModel"); + +// get - returns all vehicles +exports.list = function list(request, response) { + OrderModel.find(function (err, orders) { + if (err) return console.error(err); + return response.json(orders); + }) +} + +// get one vehicle by id +exports.show = function show(request, response) { + OrderModel.findById(request.params.id, function (err, order){ + if (err) return console.error(err); + return response.json(order); + }) +} + +// post +exports.create = function create(request, response) { + const newOrder = new OrderModel({ + id: request.body.id, + orderDate: request.body.orderDate, + orderTime: request.body.orderTime, + amount: request.body.amount + }) + newOrder.save().then(savedOrder=>{ + console.log(savedOrder) + }) +} \ No newline at end of file diff --git a/controllers/tasksController.js b/controllers/tasksController.js new file mode 100644 index 0000000..11b8ced --- /dev/null +++ b/controllers/tasksController.js @@ -0,0 +1,26 @@ +let TaskModel = require("../models/TaskModel"); + +// get - returns all vehicles +exports.list = function list(request, response) { + TaskModel.find(function (err, tasks) { + if (err) return console.error(err); + return response.json(tasks); + }) +} + +// get one vehicle by id +exports.show = function show(request, response) { + TaskModel.findById(request.params.id, function (err, task){ + if (err) return console.error(err); + return response.json(task); + }) +} + +// post +exports.create = function create(request, response) { + const newTask = new TaskModel(request.body); + newTask.save((err,task) => { + response.json(task); + }); +} + \ No newline at end of file diff --git a/models/MessageModel.js b/models/MessageModel.js new file mode 100644 index 0000000..c53d7c3 --- /dev/null +++ b/models/MessageModel.js @@ -0,0 +1,12 @@ +const mongoose = require('mongoose'); + +var MessageSchema = new mongoose.Schema({ + id: Number, + name: String, + date: String, + message: String +}); + +var Message = mongoose.model('Order', MessageSchema); + +module.exports = Message \ No newline at end of file diff --git a/models/OrderModel.js b/models/OrderModel.js new file mode 100644 index 0000000..6a527ad --- /dev/null +++ b/models/OrderModel.js @@ -0,0 +1,12 @@ +const mongoose = require('mongoose'); + +var OrderSchema = new mongoose.Schema({ + id: Number, + orderDate: String, + orderTime: String, + amount: String +}); + +// var Order = mongoose.model('Order', OrderSchema); + +module.exports = mongoose.model('Order', OrderSchema); \ No newline at end of file diff --git a/models/TaskModels.js b/models/TaskModels.js new file mode 100644 index 0000000..88de7c5 --- /dev/null +++ b/models/TaskModels.js @@ -0,0 +1,11 @@ +const mongoose = require('mongoose'); + +var TaskSchema = new mongoose.Schema({ + id: Number, + task: String, + date: String +}); + +var Task = mongoose.model('Task', TaskSchema); + +module.exports = Task \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 4c5a16c..7567d89 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2643,8 +2643,7 @@ "bluebird": { "version": "3.5.5", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz", - "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==", - "dev": true + "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==" }, "bn.js": { "version": "4.11.8", @@ -2873,6 +2872,11 @@ "node-int64": "^0.4.0" } }, + "bson": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/bson/-/bson-1.1.1.tgz", + "integrity": "sha512-jCGVYLoYMHDkOsbwJZBCqwMHyH4c+wzgI9hG7Z6SZJRXWr+x58pdIbm2i9a/jFGCkRJqRUr8eoI7lDWa0hTkxg==" + }, "buffer": { "version": "4.9.1", "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", @@ -4373,6 +4377,26 @@ "cssom": "0.3.x" } }, + "csvtojson": { + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/csvtojson/-/csvtojson-2.0.10.tgz", + "integrity": "sha512-lUWFxGKyhraKCW8Qghz6Z0f2l/PqB1W3AO0HKJzGIQ5JRSlR651ekJDiGJbBT4sRNNv5ddnSGVEnsxP9XRCVpQ==", + "requires": { + "bluebird": "^3.5.1", + "lodash": "^4.17.3", + "strip-bom": "^2.0.0" + }, + "dependencies": { + "strip-bom": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "requires": { + "is-utf8": "^0.2.0" + } + } + } + }, "cyclist": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz", @@ -7033,6 +7057,11 @@ "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", "dev": true }, + "is-utf8": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", + "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=" + }, "is-windows": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", @@ -8443,6 +8472,11 @@ "object.assign": "^4.1.0" } }, + "kareem": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.3.0.tgz", + "integrity": "sha512-6hHxsp9e6zQU8nXsP+02HGWXwTkOEw6IROhF2ZA28cYbUk4eJ6QbtZvdqZOdD9YPKghG3apk5eOCvs+tLl3lRg==" + }, "killable": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz", @@ -8615,8 +8649,7 @@ "lodash": { "version": "4.17.15", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", - "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", - "dev": true + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" }, "lodash._reinterpolate": { "version": "3.0.0", @@ -8816,6 +8849,12 @@ "readable-stream": "^2.0.1" } }, + "memory-pager": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz", + "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==", + "optional": true + }, "merge-deep": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/merge-deep/-/merge-deep-3.0.2.tgz", @@ -9034,6 +9073,61 @@ } } }, + "mongodb": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.2.7.tgz", + "integrity": "sha512-2YdWrdf1PJgxcCrT1tWoL6nHuk6hCxhddAAaEh8QJL231ci4+P9FLyqopbTm2Z2sAU6mhCri+wd9r1hOcHdoMw==", + "requires": { + "mongodb-core": "3.2.7", + "safe-buffer": "^5.1.2" + } + }, + "mongodb-core": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-3.2.7.tgz", + "integrity": "sha512-WypKdLxFNPOH/Jy6i9z47IjG2wIldA54iDZBmHMINcgKOUcWJh8og+Wix76oGd7EyYkHJKssQ2FAOw5Su/n4XQ==", + "requires": { + "bson": "^1.1.1", + "require_optional": "^1.0.1", + "safe-buffer": "^5.1.2", + "saslprep": "^1.0.0" + } + }, + "mongoose": { + "version": "5.6.8", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.6.8.tgz", + "integrity": "sha512-BhgGU/KvnVX8WbamcWgtG/45rp+xZnaF9MhNbzESIIYxK7g5QurXYcaGGCm/JFiIdIxkVUgBycWG7UzRUEzvDg==", + "requires": { + "async": "2.6.2", + "bson": "~1.1.1", + "kareem": "2.3.0", + "mongodb": "3.2.7", + "mongodb-core": "3.2.7", + "mongoose-legacy-pluralize": "1.0.2", + "mpath": "0.6.0", + "mquery": "3.2.1", + "ms": "2.1.2", + "regexp-clone": "1.0.0", + "safe-buffer": "5.1.2", + "sift": "7.0.1", + "sliced": "1.0.1" + }, + "dependencies": { + "async": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz", + "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==", + "requires": { + "lodash": "^4.17.11" + } + } + } + }, + "mongoose-legacy-pluralize": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/mongoose-legacy-pluralize/-/mongoose-legacy-pluralize-1.0.2.tgz", + "integrity": "sha512-Yo/7qQU4/EyIS8YDFSeenIvXxZN+ld7YdV9LqFVQJzTLye8unujAWPZ4NWKfFA+RNjh+wvTWKY9Z3E5XM6ZZiQ==" + }, "move-concurrently": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", @@ -9048,11 +9142,47 @@ "run-queue": "^1.0.3" } }, + "mpath": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.6.0.tgz", + "integrity": "sha512-i75qh79MJ5Xo/sbhxrDrPSEG0H/mr1kcZXJ8dH6URU5jD/knFxCVqVC/gVSW7GIXL/9hHWlT9haLbCXWOll3qw==" + }, + "mquery": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/mquery/-/mquery-3.2.1.tgz", + "integrity": "sha512-kY/K8QToZWTTocm0U+r8rqcJCp5PRl6e8tPmoDs5OeSO3DInZE2rAL6AYH+V406JTo8305LdASOQcxRDqHojyw==", + "requires": { + "bluebird": "3.5.1", + "debug": "3.1.0", + "regexp-clone": "^1.0.0", + "safe-buffer": "5.1.2", + "sliced": "1.0.1" + }, + "dependencies": { + "bluebird": { + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz", + "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==" + }, + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + } + } + }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "multicast-dns": { "version": "6.2.3", @@ -11389,6 +11519,11 @@ "safe-regex": "^1.1.0" } }, + "regexp-clone": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/regexp-clone/-/regexp-clone-1.0.0.tgz", + "integrity": "sha512-TuAasHQNamyyJ2hb97IuBEif4qBHGjPHBS64sZwytpLEqtBQ1gPJTnOaQ6qmpET16cK14kkjbazl6+p0RRv0yw==" + }, "regexp-tree": { "version": "0.1.11", "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.11.tgz", @@ -11592,6 +11727,27 @@ "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", "dev": true }, + "require_optional": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz", + "integrity": "sha512-qhM/y57enGWHAe3v/NcwML6a3/vfESLe/sGM2dII+gEO0BpKRUkWZow/tyloNqJyN6kXSl3RyyM8Ll5D/sJP8g==", + "requires": { + "resolve-from": "^2.0.0", + "semver": "^5.1.0" + }, + "dependencies": { + "resolve-from": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz", + "integrity": "sha1-lICrIOlP+h2egKgEx+oUdhGWa1c=" + }, + "semver": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz", + "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==" + } + } + }, "requireindex": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/requireindex/-/requireindex-1.2.0.tgz", @@ -11750,6 +11906,15 @@ "walker": "~1.0.5" } }, + "saslprep": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/saslprep/-/saslprep-1.0.3.tgz", + "integrity": "sha512-/MY/PEMbk2SuY5sScONwhUDsV2p77Znkb/q3nSVstq/yQzYJOH/Azh29p9oJLsl3LnQwSvZDKagDGBsBwSooag==", + "optional": true, + "requires": { + "sparse-bitfield": "^3.0.3" + } + }, "sass-loader": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.1.0.tgz", @@ -12106,6 +12271,11 @@ "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==", "dev": true }, + "sift": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/sift/-/sift-7.0.1.tgz", + "integrity": "sha512-oqD7PMJ+uO6jV9EQCl0LrRw1OwsiPsiFQR5AR30heR+4Dl7jBBbDLnNvWiak20tzZlSE1H7RB30SX/1j/YYT7g==" + }, "signal-exit": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", @@ -12152,6 +12322,11 @@ "is-fullwidth-code-point": "^2.0.0" } }, + "sliced": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz", + "integrity": "sha1-CzpmK10Ewxd7GSa+qCsD+Dei70E=" + }, "snapdragon": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", @@ -12364,6 +12539,15 @@ "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=", "dev": true }, + "sparse-bitfield": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz", + "integrity": "sha1-/0rm5oZWBWuks+eSqzM004JzyhE=", + "optional": true, + "requires": { + "memory-pager": "^1.0.2" + } + }, "spdx-correct": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz", diff --git a/package.json b/package.json index bac423e..19a1106 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,9 @@ }, "dependencies": { "body-parser": "^1.19.0", + "csvtojson": "^2.0.10", "express": "^4.17.1", + "mongoose": "^5.6.8", "prop-types": "*", "react": "*", "react-dom": "*" diff --git a/routes/dataRoute.js b/routes/dataRoute.js new file mode 100644 index 0000000..73dfe97 --- /dev/null +++ b/routes/dataRoute.js @@ -0,0 +1,38 @@ +const express = require("express"); +const router = express.Router(); +const csvFilePath = "../data.csv"; +const csv = require("csvtojson/v1"); + +router.get("/newComments", (req, res)=>{ + csv() + .fromFile(csvFilePath) + .then(jsonObj=>{ + res.send(jsonObj[0].new_comments) + }) +}); + +router.get("/newTasks", (req, res)=>{ + csv() + .fromFile(csvFilePath) + .then(jsonObj=>{ + res.send(jsonObj[0].new_tasks) + }) +}); + + +router.get("/newOrders", (req, res)=>{ + csv() + .fromFile(csvFilePath) + .then(jsonObj=>{ + res.send(jsonObj[0].new_orders) + }) +}); + + +router.get("/tickets", (req, res)=>{ + csv() + .fromFile(csvFilePath) + .then(jsonObj=>{ + res.send(jsonObj[0].tickets) + }) +}); diff --git a/routes/dateTimeRoute.js b/routes/dateTimeRoute.js deleted file mode 100644 index 3041bed..0000000 --- a/routes/dateTimeRoute.js +++ /dev/null @@ -1,2 +0,0 @@ -const express = require("express"); -const router = express.Router(); \ No newline at end of file diff --git a/routes/foxRoute.js b/routes/foxRoute.js new file mode 100644 index 0000000..e69de29 diff --git a/routes/messagesRoute.js b/routes/messagesRoute.js index 3041bed..2809056 100644 --- a/routes/messagesRoute.js +++ b/routes/messagesRoute.js @@ -1,2 +1,11 @@ const express = require("express"); -const router = express.Router(); \ No newline at end of file +const router = express.Router(); +const {list,show,create} = require("../controllers/messagesController"); + + +// TASKS +router.get('/messages', list) +router.get('/messages/:id', show) +router.post('/messages', create) + + module.exports = router; \ No newline at end of file diff --git a/routes/newCommentsRoute.js b/routes/newCommentsRoute.js deleted file mode 100644 index 3041bed..0000000 --- a/routes/newCommentsRoute.js +++ /dev/null @@ -1,2 +0,0 @@ -const express = require("express"); -const router = express.Router(); \ No newline at end of file diff --git a/routes/newOrdersRoute.js b/routes/newOrdersRoute.js deleted file mode 100644 index 3041bed..0000000 --- a/routes/newOrdersRoute.js +++ /dev/null @@ -1,2 +0,0 @@ -const express = require("express"); -const router = express.Router(); \ No newline at end of file diff --git a/routes/newTasksRoute.js b/routes/newTasksRoute.js deleted file mode 100644 index 3041bed..0000000 --- a/routes/newTasksRoute.js +++ /dev/null @@ -1,2 +0,0 @@ -const express = require("express"); -const router = express.Router(); \ No newline at end of file diff --git a/routes/ordersRoute.js b/routes/ordersRoute.js index 3041bed..d81bf3f 100644 --- a/routes/ordersRoute.js +++ b/routes/ordersRoute.js @@ -1,2 +1,11 @@ const express = require("express"); -const router = express.Router(); \ No newline at end of file +const router = express.Router(); +const {list,show,create} = require("../controllers/ordersController"); + + +// TASKS +router.get('/orders', list) +router.get('/orders/:id', show) +router.post('/orders', create) + + module.exports = router; \ No newline at end of file diff --git a/routes/tasksRoute.js b/routes/tasksRoute.js index 882fa5f..5fc6ecb 100644 --- a/routes/tasksRoute.js +++ b/routes/tasksRoute.js @@ -1,5 +1,11 @@ const express = require("express"); const router = express.Router(); +const {list,show,create} = require("../controllers/tasksController"); -router.get() \ No newline at end of file +// TASKS +router.get('/tasks', list) +router.get('/tasks/:id', show) +router.post('/tasks', create) + + module.exports = router; diff --git a/routes/ticketsRoute.js b/routes/ticketsRoute.js deleted file mode 100644 index 3041bed..0000000 --- a/routes/ticketsRoute.js +++ /dev/null @@ -1,2 +0,0 @@ -const express = require("express"); -const router = express.Router(); \ No newline at end of file diff --git a/server/index.js b/server/index.js index bab6587..93b758b 100644 --- a/server/index.js +++ b/server/index.js @@ -1,8 +1,21 @@ let express = require("express"); let bodyParser = require("body-parser"); +let dataRoute = require("../routes/dataRoute"); +let messagesRoute = require("../routes/messagesRoute"); +let ordersRoute = require("../routes/ordersRoute"); +let tasksRoute = require("../routes/tasksRoute") let app = express(); app.use(bodyParser.json()); app.use(express.static("public")); +app.use(dataRoute); +app.use(messagesRoute); +app.use(ordersRoute); +app.use(tasksRoute); -app.listen(3000) \ No newline at end of file +app.listen(3000, (err) => { + if (err) { + return console.log("Error", err); + } + console.log("Web server is now listening for messages on port",3000); +}) \ No newline at end of file From c732d331e373c6dfff85250fdebb350b1ab7404d Mon Sep 17 00:00:00 2001 From: AFutureWebDev Date: Sun, 11 Aug 2019 17:35:45 -0500 Subject: [PATCH 4/4] finished --- controllers/messagesController.js | 11 ++++++++--- controllers/ordersController.js | 6 +++--- controllers/tasksController.js | 10 +++++++--- models/MessageModel.js | 4 ++-- models/OrderModel.js | 4 ++-- models/{TaskModels.js => TaskModel.js} | 0 package-lock.json | 5 +++++ package.json | 1 + routes/dataRoute.js | 16 ++++++++++------ routes/foxRoute.js | 14 ++++++++++++++ server/index.js | 6 ++++++ 11 files changed, 58 insertions(+), 19 deletions(-) rename models/{TaskModels.js => TaskModel.js} (100%) diff --git a/controllers/messagesController.js b/controllers/messagesController.js index 66ab45e..1c91d1a 100644 --- a/controllers/messagesController.js +++ b/controllers/messagesController.js @@ -18,8 +18,13 @@ exports.show = function show(request, response) { // post exports.create = function create(request, response) { - const newMessage = new MessageModel(request.body); - newMessage.save((err, message) => { - response.json(message); + const newMessage = new MessageModel({ + id: request.body.id, + name: request.body.name, + date: request.body.date, + message:request.body.message}); + + newMessage.save(() => { + response.json(newMessage); }); } \ No newline at end of file diff --git a/controllers/ordersController.js b/controllers/ordersController.js index baef6ac..05d59c2 100644 --- a/controllers/ordersController.js +++ b/controllers/ordersController.js @@ -24,7 +24,7 @@ exports.create = function create(request, response) { orderTime: request.body.orderTime, amount: request.body.amount }) - newOrder.save().then(savedOrder=>{ - console.log(savedOrder) - }) + newOrder.save(()=>{ + return response.json(newOrder); + }); } \ No newline at end of file diff --git a/controllers/tasksController.js b/controllers/tasksController.js index 11b8ced..69894ab 100644 --- a/controllers/tasksController.js +++ b/controllers/tasksController.js @@ -18,9 +18,13 @@ exports.show = function show(request, response) { // post exports.create = function create(request, response) { - const newTask = new TaskModel(request.body); - newTask.save((err,task) => { - response.json(task); + const newTask = new TaskModel({ + id: request.body.id, + task: request.bod.task, + date: request.body.date + }); + newTask.save(() => { + return response.json(newTask); }); } \ No newline at end of file diff --git a/models/MessageModel.js b/models/MessageModel.js index c53d7c3..0e153f0 100644 --- a/models/MessageModel.js +++ b/models/MessageModel.js @@ -2,11 +2,11 @@ const mongoose = require('mongoose'); var MessageSchema = new mongoose.Schema({ id: Number, - name: String, + name: String, date: String, message: String }); -var Message = mongoose.model('Order', MessageSchema); +var Message = mongoose.model('Message', MessageSchema); module.exports = Message \ No newline at end of file diff --git a/models/OrderModel.js b/models/OrderModel.js index 6a527ad..0141ae1 100644 --- a/models/OrderModel.js +++ b/models/OrderModel.js @@ -7,6 +7,6 @@ var OrderSchema = new mongoose.Schema({ amount: String }); -// var Order = mongoose.model('Order', OrderSchema); +var Order = mongoose.model('Order', OrderSchema); -module.exports = mongoose.model('Order', OrderSchema); \ No newline at end of file +module.exports = Order; \ No newline at end of file diff --git a/models/TaskModels.js b/models/TaskModel.js similarity index 100% rename from models/TaskModels.js rename to models/TaskModel.js diff --git a/package-lock.json b/package-lock.json index 7567d89..a87179e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9272,6 +9272,11 @@ "lower-case": "^1.1.1" } }, + "node-fetch": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", + "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" + }, "node-forge": { "version": "0.7.5", "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.5.tgz", diff --git a/package.json b/package.json index 19a1106..f408de0 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "csvtojson": "^2.0.10", "express": "^4.17.1", "mongoose": "^5.6.8", + "node-fetch": "^2.6.0", "prop-types": "*", "react": "*", "react-dom": "*" diff --git a/routes/dataRoute.js b/routes/dataRoute.js index 73dfe97..604301a 100644 --- a/routes/dataRoute.js +++ b/routes/dataRoute.js @@ -1,11 +1,13 @@ const express = require("express"); const router = express.Router(); -const csvFilePath = "../data.csv"; -const csv = require("csvtojson/v1"); +// const csvFilePath = "../data.csv"; +const filePath = './server/data.csv'; +// const csv = require("csvtojson/v1"); +const csv = require("csvtojson"); router.get("/newComments", (req, res)=>{ csv() - .fromFile(csvFilePath) + .fromFile(filePath) .then(jsonObj=>{ res.send(jsonObj[0].new_comments) }) @@ -13,7 +15,7 @@ router.get("/newComments", (req, res)=>{ router.get("/newTasks", (req, res)=>{ csv() - .fromFile(csvFilePath) + .fromFile(filePath) .then(jsonObj=>{ res.send(jsonObj[0].new_tasks) }) @@ -22,7 +24,7 @@ router.get("/newTasks", (req, res)=>{ router.get("/newOrders", (req, res)=>{ csv() - .fromFile(csvFilePath) + .fromFile(filePath) .then(jsonObj=>{ res.send(jsonObj[0].new_orders) }) @@ -31,8 +33,10 @@ router.get("/newOrders", (req, res)=>{ router.get("/tickets", (req, res)=>{ csv() - .fromFile(csvFilePath) + .fromFile(filePath) .then(jsonObj=>{ res.send(jsonObj[0].tickets) }) }); + +module.exports = router; diff --git a/routes/foxRoute.js b/routes/foxRoute.js index e69de29..bfe2dae 100644 --- a/routes/foxRoute.js +++ b/routes/foxRoute.js @@ -0,0 +1,14 @@ +const express = require("express"); +const router = express.Router(); +const fetch = require('node-fetch'); + +router.get("/foxes", (req, res)=>{ + fetch('https://randomfox.ca/floof/') + .then(res => res.json()) + .then(json=>{ + console.log(json) + res.json(json.image) + }) +}) + +module.exports = router; \ No newline at end of file diff --git a/server/index.js b/server/index.js index 93b758b..13faaba 100644 --- a/server/index.js +++ b/server/index.js @@ -4,6 +4,11 @@ let dataRoute = require("../routes/dataRoute"); let messagesRoute = require("../routes/messagesRoute"); let ordersRoute = require("../routes/ordersRoute"); let tasksRoute = require("../routes/tasksRoute") +let foxRoute = require("../routes/foxRoute"); + +const mongoose = require('mongoose'); +mongoose.connect('mongodb+srv://database-user-1:password12345@cluster0-f06bo.mongodb.net/test?retryWrites=true&w=majority', {useNewUrlParser: true}); + let app = express(); app.use(bodyParser.json()); @@ -12,6 +17,7 @@ app.use(dataRoute); app.use(messagesRoute); app.use(ordersRoute); app.use(tasksRoute); +app.use(foxRoute); app.listen(3000, (err) => { if (err) {