FACN3 · nj-io · Jan 22, 2018 · Jan 22, 2018 · Jan 22, 2018 · Jan 24, 2018
diff --git a/.eslintignore b/.eslintignore
@@ -1,2 +1,3 @@
 public/
 node_modules/
+chat-program/
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,6 +1,7 @@
 {
   "extends": ["airbnb", "prettier", "prettier/react"],
   "plugins": ["prettier"],
+  "parser": "babel-eslint",
   "parserOptions": {
     "ecmaVersion": 2016,
     "sourceType": "module",

diff --git a/404.html b/404.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title></title>
+  </head>
+  <body>
+    <h1>404</h1>
+    <h2>The page you requested has not been found</h2>
+  </body>
+</html>
diff --git a/config.env b/config.env
@@ -0,0 +1 @@
+DATABASE_URL= postgres://samis:12345@localhost:8080/coin
diff --git a/database/db_build.js b/database/db_build.js
@@ -1,10 +1,11 @@
 const fs = require('fs');
 const connect = require('./db_connection');
+
 const buildScript = fs.readFileSync(`${__dirname}/db_build.sql`, `utf8`);
 
-connect.query(buildScript, (err, res) => {
+connect.query(buildScript, err => {
   if (err) {
     throw err;
   }
   connect.end();
-})
+});
diff --git a/database/db_build.sql b/database/db_build.sql
@@ -5,7 +5,7 @@ DROP TABLE IF EXISTS posts CASCADE;
 
 CREATE TABLE users (
 user_id SERIAL PRIMARY KEY ,
-user_name VARCHAR(100) NOT NULL UNIQUE ,
+username VARCHAR(100) NOT NULL UNIQUE ,
 password VARCHAR(100) NOT NULL ,
 email TEXT NOT NULL UNIQUE,
 country TEXT NOT NULL,
@@ -16,7 +16,7 @@ added_date DATE DEFAULT now()
 CREATE TABLE posts(
   post_id SERIAL PRIMARY KEY,
   user_id INTEGER NOT NULL ,
-  prefferedPayment VARCHAR(100) NOT NULL,
+  prefferedpayment VARCHAR(100) NOT NULL,
   country TEXT NOT NULL,
   city TEXT NOT NULL,
   coin TEXT NOT NULL,
@@ -26,10 +26,10 @@ CREATE TABLE posts(
   added_date DATE DEFAULT now()
 );
 
-INSERT INTO users(user_name , password ,email, country,city) VALUES
+INSERT INTO users(username , password ,email, country,city) VALUES
 ('hawk Kayleb' , '123' , 'user@gmail.com' , 'Israel' ,'Haifa' );
 
-INSERT INTO posts(user_id, prefferedPayment, country, city, coin, qty, price, buyerSeller)
+INSERT INTO posts(user_id, prefferedpayment, country, city, coin, qty, price, buyerSeller)
  VALUES (1, 'Bank Transfer', 'Israel', 'Tel Aviv', 'Bitcoin', 1, 17000, 'Seller');
 
 COMMIT;
diff --git a/database/db_connection.js b/database/db_connection.js
@@ -1,11 +1,7 @@
-const {Pool} = require('pg');
-const url = require('url');
+const { Pool } = require('pg');
 require('env2')('config.env');
 
 if (!process.env.DATABASE_URL)
-  throw new Error("enviroment var for database must be set");
+  throw new Error('enviroment var for database must be set');
 
-const params = url.parse(process.env.DATABASE_URL);
-const [username, password] = params.auth.split(':');
-
-module.exports = new Pool({connectionString: process.env.DATABASE_URL});
+module.exports = new Pool({ connectionString: process.env.DATABASE_URL });
diff --git a/database/queries/addUsers.js b/database/queries/addUsers.js
@@ -0,0 +1,20 @@
+const connect = require("../db_connection");
+const bcrypt = require("bcrypt");
+
+const salt = 10;
+
+ const addUser = (username, password, email, country, city, cb) => {
+   bcrypt.hash(password, salt, (err, hash) => {
+     connect.query(`INSERT INTO users (username, password, email, country, city) VALUES ($1, $2, $3, $4, $5)`,
+     [username, hash, email, country, city], (err, result) => {
+       if(err){
+         console.log("error in writing the query", err);
+         cb(err);
+       }else{
+         cb(null, result);
+       }
+     });
+   });
+ }
+
+ module.exports = {addUser};
diff --git a/database/queries/fetchPosts.js b/database/queries/fetchPosts.js
@@ -1,13 +1,16 @@
 const connect = require('../db_connection');
 
 const posts = (req, res) => {
-  connect.query('SELECT * FROM posts INNER JOIN users ON (posts.user_id = users.user_id)', (err, posts) => {
-    if (err) {
-      res.status(500).end("Server Error, Please Try In Other Time");
-    } else {
-      res.send(posts.rows);
+  connect.query(
+    `SELECT * FROM posts INNER JOIN users ON (posts.user_id = users.user_id)`,
+    (err, posts) => {
+      if (err) {
+        res.status(500).end('Server Error, Please Try In Other Time');
+      } else {
+        res.send(posts.rows);
+      }
     }
-  });
-}
+  );
+};
 
 module.exports = posts;
diff --git a/database/queries/userPosts.js b/database/queries/userPosts.js
@@ -0,0 +1,14 @@
+const connect = require('../db_connection');
+
+const userPosts = (username, cb) => {
+  connect.query('SELECT * FROM posts INNER JOIN users ON (posts.user_id = users.user_id) WHERE username = $1', [username], (err, posts) => {
+    if (err) {
+      cb(err);
+    } else {
+      // console.log('post.rows:', post.rows);
+      cb(null, posts.rows);
+    }
+  });
+}
+
+module.exports = userPosts;
diff --git a/database/queries/validateUser.js b/database/queries/validateUser.js
@@ -0,0 +1,29 @@
+const connect = require('../db_connection');
+const bcrypt = require('bcrypt');
+
+const validateUser = (user, cb) => {
+  connect.query(
+    `SELECT * FROM users WHERE username = $1`,
+    [user.username],
+    (err, res) => {
+      if (err) {
+        return cb(err);
+      }
+      if (res.rows.length == 0) {
+        return cb(null, 0);
+      }
+
+      bcrypt.compare(user.password, res.rows[0].password, (err, isValid) => {
+        if (err) {
+          return cb(err);
+        }
+        if (!isValid) {
+          return cb(null, 0);
+        }
+        return cb(null, res.rows[0]);
+      });
+    }
+  );
+};
+
+module.exports = validateUser;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		DATABASE_URL= postgres://samis:12345@localhost:8080/coin
Copy link Copy Markdown Collaborator claireinez Jan 24, 2018 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. This file shouldn't be in source control.