diff --git a/.gitignore b/.gitignore index 8535ebb..b93ca10 100644 --- a/.gitignore +++ b/.gitignore @@ -1,15 +1,12 @@ -<<<<<<< HEAD -# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. - # dependencies client/node_modules -<<<<<<< HEAD client/.pnp client/.env /client.pnp.js server/node_modules node_modules + # testing /coverage @@ -17,27 +14,12 @@ node_modules /build # misc +.env .DS_Store .env.local .env.development.local .env.test.local .env.production.local - npm-debug.log* yarn-debug.log* yarn-error.log* -client\node_modules -server\node_modules -======= -client/node_modules -server/node_modules ->>>>>>> git ignore node modules -======= -server/node_modules -node_modules ->>>>>>> ignore server modules -======= -client/node_modules -server/node_modules -node_modules ->>>>>>> 5cf48269df3d248df82e7fe4752d7e0cde35ca86 diff --git a/config/connectToDb.js b/config/connectToDb.js deleted file mode 100644 index 3ba52be..0000000 --- a/config/connectToDb.js +++ /dev/null @@ -1,23 +0,0 @@ -const mongoose = require("mongoose"); -const config = require('config'); - -const connectToDb = async () => { - try{ - await mongoose.connect( - config.get('mongoURI'), - { - useCreateIndex:true, - useFindAndModify:true, - useUnifiedTopology:true, - useNewUrlParser: true - } - ) - console.log("mongo connection secure!"); - - } catch(error){ - console.log(error); - process.exit(1); - } -} - -module.exports = connectToDb; \ No newline at end of file diff --git a/config/default.json b/config/default.json deleted file mode 100644 index ac4ed5b..0000000 --- a/config/default.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "mongoURI": "mongodb+srv://admin:ABxXFUBs5FMiAaDJ@form.iynew.mongodb.net/?retryWrites=true&w=majority", - "jwtSecret": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c" -} \ No newline at end of file diff --git a/middleware/auth.js b/middleware/auth.js index b8578d1..d49cccc 100644 --- a/middleware/auth.js +++ b/middleware/auth.js @@ -1,5 +1,4 @@ const jwt = require("jsonwebtoken"); -const config = require("config"); const auth = (req, res, next) => { try { @@ -9,7 +8,7 @@ const auth = (req, res, next) => { .status(401) .json({ msg: "No authentication token, authorization denied." }); - const verified = jwt.verify(token, config.get("jwtSecret") ); + const verified = jwt.verify(token, process.env.jwtSecret); if (!verified) return res .status(401) diff --git a/package-lock.json b/package-lock.json index 048e436..d2c1888 100644 --- a/package-lock.json +++ b/package-lock.json @@ -65,9 +65,9 @@ } }, "anymatch": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", - "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", + "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", "requires": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" @@ -79,9 +79,9 @@ "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" }, "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" }, "bcryptjs": { "version": "2.4.3", @@ -89,9 +89,9 @@ "integrity": "sha1-mrVie5PmBiH/fNrF2pczAn3x0Ms=" }, "binary-extensions": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz", - "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==" + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==" }, "bl": { "version": "2.2.1", @@ -230,13 +230,13 @@ } }, "chokidar": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz", - "integrity": "sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==", + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz", + "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==", "requires": { "anymatch": "~3.1.1", "braces": "~3.0.2", - "fsevents": "~2.1.2", + "fsevents": "~2.3.1", "glob-parent": "~5.1.0", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", @@ -532,9 +532,9 @@ "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" }, "fsevents": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", - "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", "optional": true }, "get-stream": { @@ -546,19 +546,19 @@ } }, "glob-parent": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", - "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "requires": { "is-glob": "^4.0.1" } }, "global-dirs": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-2.0.1.tgz", - "integrity": "sha512-5HqUqdhkEovj2Of/ms3IeS/EekcO54ytHRLV4PEY2rhRwrHXLQjeVEES0Lhka0xwNDtGYn58wyC4s5+MHsOO6A==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-2.1.0.tgz", + "integrity": "sha512-MG6kdOUh/xBnyo9cJFeIKkLEc1AyFq42QTU4XiX51i2NEdxLxLWXIjEjmqKeSuKR7pAZjTqUVoT2b2huxVLgYQ==", "requires": { - "ini": "^1.3.5" + "ini": "1.3.7" } }, "got": { @@ -580,9 +580,9 @@ } }, "graceful-fs": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", - "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==" + "version": "4.2.6", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz", + "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==" }, "has-flag": { "version": "3.0.0", @@ -640,9 +640,9 @@ "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" }, "ini": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==" + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.7.tgz", + "integrity": "sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ==" }, "ipaddr.js": { "version": "1.9.1", @@ -708,9 +708,9 @@ "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==" }, "is-path-inside": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz", - "integrity": "sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==" + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==" }, "is-typedarray": { "version": "1.0.0", @@ -1007,9 +1007,9 @@ "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==" }, "nodemon": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.6.tgz", - "integrity": "sha512-4I3YDSKXg6ltYpcnZeHompqac4E6JeAMpGm8tJnB9Y3T0ehasLa4139dJOcCrB93HHrUMsCrKtoAlXTqT5n4AQ==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.7.tgz", + "integrity": "sha512-XHzK69Awgnec9UzHr1kc8EomQh4sjTQ8oRf8TsGrSmHDx9/UmiGG9E/mM3BuTfNeFwdNBvrqQq/RHL0xIeyFOA==", "requires": { "chokidar": "^3.2.2", "debug": "^3.2.6", @@ -1024,17 +1024,17 @@ }, "dependencies": { "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "requires": { "ms": "^2.1.1" } }, "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" } } }, @@ -1111,9 +1111,9 @@ "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" }, "picomatch": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", - "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==" + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz", + "integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==" }, "prepend-http": { "version": "2.0.0", @@ -1216,9 +1216,9 @@ "integrity": "sha512-TuAasHQNamyyJ2hb97IuBEif4qBHGjPHBS64sZwytpLEqtBQ1gPJTnOaQ6qmpET16cK14kkjbazl6+p0RRv0yw==" }, "registry-auth-token": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.0.tgz", - "integrity": "sha512-P+lWzPrsgfN+UEpDS3U8AQKg/UjZX6mQSJueZj3EK+vNESoqBSpBUD3gmu4sF9lOsjXWjF11dQKUqemf3veq1w==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.1.tgz", + "integrity": "sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==", "requires": { "rc": "^1.2.8" } @@ -1365,9 +1365,9 @@ "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" }, "string-width": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", - "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", + "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", "requires": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -1574,16 +1574,10 @@ "typedarray-to-buffer": "^3.1.5" } }, - "xdg-basedir": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz", - "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==" - } - }, - "xdg-basedir": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz", "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==" } } +} diff --git a/package.json b/package.json index fe903cc..8a594fe 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "server.js", "scripts": { "start": "node server.js", - "app": "cd .. && npm start" + "app": "nodemon server.js" }, "author": "B. Priyatham Sai chand", "license": "ISC", @@ -19,10 +19,10 @@ "express-validator": "^6.6.1", "jsonwebtoken": "^8.5.1", "mongoose": "^5.10.13", - "nodemon": "^2.0.6" + "nodemon": "^2.0.7" }, "engines": { "node": "14.x", "npm": "6.14.8" -} + } } diff --git a/public/_redirects b/public/_redirects deleted file mode 100644 index c7a085e..0000000 --- a/public/_redirects +++ /dev/null @@ -1 +0,0 @@ -/* /index.html 200 diff --git a/public/apple_badge.svg b/public/apple_badge.svg deleted file mode 100644 index 56afb49..0000000 --- a/public/apple_badge.svg +++ /dev/null @@ -1,46 +0,0 @@ - - Download_on_the_App_Store_Badge_US-UK_RGB_blk_4SVG_092917 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/avasa.jpg b/public/avasa.jpg deleted file mode 100644 index 1239757..0000000 Binary files a/public/avasa.jpg and /dev/null differ diff --git a/public/avasa_optmized.jpg b/public/avasa_optmized.jpg deleted file mode 100644 index 4d26298..0000000 Binary files a/public/avasa_optmized.jpg and /dev/null differ diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index f5415ee..0000000 Binary files a/public/favicon.ico and /dev/null differ diff --git a/public/google-play-badge.png b/public/google-play-badge.png deleted file mode 100644 index c77b746..0000000 Binary files a/public/google-play-badge.png and /dev/null differ diff --git a/public/index.html b/public/index.html deleted file mode 100644 index 9dacf89..0000000 --- a/public/index.html +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - Locaft - - - -
- - - diff --git a/public/indigo.jpg b/public/indigo.jpg deleted file mode 100644 index 4b3e890..0000000 Binary files a/public/indigo.jpg and /dev/null differ diff --git a/public/indigo_optimized.jpg b/public/indigo_optimized.jpg deleted file mode 100644 index cdb0cad..0000000 Binary files a/public/indigo_optimized.jpg and /dev/null differ diff --git a/public/locaft.jpg b/public/locaft.jpg deleted file mode 100644 index d069aa8..0000000 Binary files a/public/locaft.jpg and /dev/null differ diff --git a/public/locaft.png b/public/locaft.png deleted file mode 100644 index 3662bb9..0000000 Binary files a/public/locaft.png and /dev/null differ diff --git a/public/locaft_optmized.jpg b/public/locaft_optmized.jpg deleted file mode 100644 index ab5baa0..0000000 Binary files a/public/locaft_optmized.jpg and /dev/null differ diff --git a/public/logo.jpg b/public/logo.jpg deleted file mode 100644 index 99a4f15..0000000 Binary files a/public/logo.jpg and /dev/null differ diff --git a/public/manifest.json b/public/manifest.json deleted file mode 100644 index 45b8cb8..0000000 --- a/public/manifest.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "short_name": "React App", - "name": "Create React App Sample", - "icons": [ - { - "src": "favicon.ico", - "sizes": "64x64 32x32 24x24 16x16", - "type": "image/x-icon" - } - ], - "start_url": ".", - "display": "standalone", - "theme_color": "#000000", - "background_color": "#ffffff" -} diff --git a/public/nobroker.jpg b/public/nobroker.jpg deleted file mode 100644 index e6b2ef1..0000000 Binary files a/public/nobroker.jpg and /dev/null differ diff --git a/public/nobroker.png b/public/nobroker.png deleted file mode 100644 index 5c70095..0000000 Binary files a/public/nobroker.png and /dev/null differ diff --git a/public/robots.txt b/public/robots.txt deleted file mode 100644 index 9dd52a5..0000000 --- a/public/robots.txt +++ /dev/null @@ -1,3 +0,0 @@ -# https://www.robotstxt.org/robotstxt.html -User-agent: * -Disallow: diff --git a/public/skyscraper.jpg b/public/skyscraper.jpg deleted file mode 100644 index f5b6e72..0000000 Binary files a/public/skyscraper.jpg and /dev/null differ diff --git a/public/skyscraper.png b/public/skyscraper.png deleted file mode 100644 index 1135a7e..0000000 Binary files a/public/skyscraper.png and /dev/null differ diff --git a/public/skyscraper1.png b/public/skyscraper1.png deleted file mode 100644 index bae5a22..0000000 Binary files a/public/skyscraper1.png and /dev/null differ diff --git a/public/vrl.jpg b/public/vrl.jpg deleted file mode 100644 index 8bd1c56..0000000 Binary files a/public/vrl.jpg and /dev/null differ diff --git a/public/vrl_optmized.jpg b/public/vrl_optmized.jpg deleted file mode 100644 index cd0a2d0..0000000 Binary files a/public/vrl_optmized.jpg and /dev/null differ diff --git a/routes/users.js b/routes/users.js index 313911f..be83fdf 100644 --- a/routes/users.js +++ b/routes/users.js @@ -10,7 +10,7 @@ router.post("/register", async (req, res) => { try { let { username,email,phonenumber,password} = req.body; - + if (!email || !password ) return res.status(400).json({ msg: "Not all fields have been entered." }); @@ -60,7 +60,7 @@ router.post("/login", async (req, res) => { const isMatch = await bcrypt.compare(password, user.password); if (!isMatch) return res.status(400).json({ msg: "Invalid credentials." }); - const token = jwt.sign({ id: user._id },config.get('jwtSecret')); + const token = jwt.sign({ id: user._id },process.env.jwtSecret); if(token) return res .json({ token, @@ -89,7 +89,7 @@ router.post("/tokenIsValid", async (req, res) => { const token = req.header("x-auth-token"); if (!token) return res.json({error: message}); - const verified = jwt.verify(token, config.get("jwtSecret")); + const verified = jwt.verify(token,process.env.jwtSecret); if (!verified) return res.json({error: message}); @@ -112,7 +112,7 @@ router.get("/", auth, async (req, res) => { }); router.put("/update", async (req, res) => { const { id,pricing } = req.body; - + if (!id) { return res.status(400).json({ Msg: "Not all fields have been entered." }); @@ -123,7 +123,8 @@ router.put("/update", async (req, res) => { console.log(user) }) }) - + }) +; module.exports = router; \ No newline at end of file diff --git a/server.js b/server.js index c36f518..487a7cf 100644 --- a/server.js +++ b/server.js @@ -1,7 +1,7 @@ const express = require("express"); -const config = require("config"); const mongoose = require("mongoose"); const cors = require("cors"); +require('dotenv').config() // set up express @@ -16,7 +16,7 @@ app.listen(PORT, () => console.log(`The server has started on port: ${PORT}`)); // set up mongoose mongoose.connect( - config.get('mongoURI'), + process.env.mongoURI, { useNewUrlParser: true, useUnifiedTopology: true, @@ -24,6 +24,7 @@ mongoose.connect( }, (err) => { if (err) throw err; + console.log("MongoDB connection established"); } );