From 3d581a2d94d63493850a776285a2dbf8309c9e49 Mon Sep 17 00:00:00 2001 From: Lydia Cheung Date: Mon, 14 Jan 2019 23:40:47 +0800 Subject: [PATCH] mvp commit --- index.js | 126 +++++++++++++++++++++++++++-------------- views/tweeds.jsx | 59 +++++++++++++++++++ views/user/NewUser.jsx | 33 +++++++++-- views/user/login.jsx | 45 +++++++++++++++ views/user/tables.sql | 11 ++++ 5 files changed, 226 insertions(+), 48 deletions(-) create mode 100644 views/tweeds.jsx create mode 100644 views/user/login.jsx create mode 100644 views/user/tables.sql diff --git a/index.js b/index.js index 4d5d595..be8518e 100644 --- a/index.js +++ b/index.js @@ -1,8 +1,8 @@ -const express = require('express'); -const methodOverride = require('method-override'); -const cookieParser = require('cookie-parser'); +const express = require("express"); +const methodOverride = require("method-override"); +const cookieParser = require("cookie-parser"); -const pg = require('pg'); +const pg = require("pg"); /** * =================================== @@ -11,33 +11,35 @@ const pg = require('pg'); */ const configs = { - user: 'akira', - host: '127.0.0.1', - database: 'testdb', - port: 5432, + user: "lydiacheung", + host: "127.0.0.1", + database: "tweedrdb", + port: 5432 }; const pool = new pg.Pool(configs); -pool.on('error', function (err) { - console.log('idle client error', err.message, err.stack); +pool.on("error", function(err) { + console.log("idle client error", err.message, err.stack); }); // Init express app const app = express(); // Set up middleware -app.use(methodOverride('_method')); +app.use(methodOverride("_method")); app.use(cookieParser()); -app.use(express.urlencoded({ - extended: true -})); +app.use( + express.urlencoded({ + extended: true + }) +); // Set react-views to be the default view engine -const reactEngine = require('express-react-views').createEngine(); -app.set('views', __dirname + '/views'); -app.set('view engine', 'jsx'); -app.engine('jsx', reactEngine); +const reactEngine = require("express-react-views").createEngine(); +app.set("views", __dirname + "/views"); +app.set("view engine", "jsx"); +app.engine("jsx", reactEngine); /** * =================================== @@ -46,30 +48,69 @@ app.engine('jsx', reactEngine); */ // Root GET request (it doesn't belong in any controller file) -app.get('/', (request, response) => { - response.send('Welcome To Tweedr.'); +app.get("/login", (request, response) => { + response.render("user/login"); }); -app.get('/users/new', (request, response) => { - response.render('user/newuser'); +app.post("/", (request, response) => { + pool.query( + "SELECT * FROM users WHERE name = $1 AND password = $2", + [request.body.name, request.body.password], + (error, queryResult) => { + if (queryResult.rowCount > 0) { + pool.query( + "SELECT content FROM tweeds WHERE user_id = $1", + [queryResult.rows[0].name], + (e, q) => { + console.log(q.rows); + response.render("tweeds", { + userName: queryResult.rows[0].name, + tweedsContent: q.rows + }); + } + ); + } else { + response.send("Log in Failed!"); + } + } + ); }); -app.post('/users', (request, response) => { - - const queryString = 'INSERT INTO users (name, password) VALUES ($1, $2)'; - const values = [ - request.body.name, - request.body.password - ]; +app.post("/tweeds", (request, response) => { + pool.query( + "INSERT INTO tweeds (content,user_id) VALUES ($1,$2)", + [request.body.tweed, request.body.name], + (error, queryResult) => { + pool.query( + "SELECT content FROM tweeds WHERE user_id = $1", + [request.body.name], + (e, q) => { + console.log(q.rows); + response.render("tweeds", { + userName: request.body.name, + tweedsContent: q.rows + }); + } + ); + } + ); +}); - // execute query - pool.query(queryString, values, (error, queryResult) => { - //response.redirect('/'); - response.send('user created'); - }); +app.get("/users/new", (request, response) => { + response.render("user/newuser"); }); +app.post("/users", (request, response) => { + const queryString = "INSERT INTO users (name, password) VALUES ($1, $2)"; + const values = [request.body.name, request.body.password]; + // execute query + pool.query(queryString, values, (error, queryResult) => { + console.log(request.body.name); + //response.redirect('/'); + response.send("user created"); + }); +}); /** * =================================== @@ -77,15 +118,16 @@ app.post('/users', (request, response) => { * =================================== */ -const server = app.listen(3000, () => console.log('~~~ Tuning in to the waves of port 3000 ~~~')); - -let onClose = function(){ +const server = app.listen(8000, () => + console.log("~~~ Tuning in to the waves of port 8000 ~~~") +); +let onClose = function() { server.close(() => { - console.log('Process terminated') - pool.end( () => console.log('Shut down db connection pool')); - }) + console.log("Process terminated"); + pool.end(() => console.log("Shut down db connection pool")); + }); }; -process.on('SIGTERM', onClose); -process.on('SIGINT', onClose); +process.on("SIGTERM", onClose); +process.on("SIGINT", onClose); diff --git a/views/tweeds.jsx b/views/tweeds.jsx new file mode 100644 index 0000000..649fb65 --- /dev/null +++ b/views/tweeds.jsx @@ -0,0 +1,59 @@ +var React = require("react"); + +class tweeds extends React.Component { + render() { + return ( + + + + + +
+
+

Welcome! {this.props.userName}

+ +

Add a Tweet

+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+ {this.props.tweedsContent.map(content => { + return ( +
+

{content.content}

+
+ ); + })} +
+
+
+ + + ); + } +} + +module.exports = tweeds; diff --git a/views/user/NewUser.jsx b/views/user/NewUser.jsx index 4faac60..4a91e91 100644 --- a/views/user/NewUser.jsx +++ b/views/user/NewUser.jsx @@ -4,16 +4,37 @@ class NewUser extends React.Component { render() { return ( - + + +
-
- name +
+
+

Register New User

+ Email: + +
-
- password: +
+
+ Password: + +
+
+ +
+
+ +
- diff --git a/views/user/login.jsx b/views/user/login.jsx new file mode 100644 index 0000000..d980c10 --- /dev/null +++ b/views/user/login.jsx @@ -0,0 +1,45 @@ +var React = require("react"); + +class login extends React.Component { + render() { + return ( + + + + + +
+
+
+

Log In

+ Email: + +
+
+
+
+ Password: + +
+
+ +
+
+ +
+
+
+ + + ); + } +} + +module.exports = login; diff --git a/views/user/tables.sql b/views/user/tables.sql new file mode 100644 index 0000000..7125944 --- /dev/null +++ b/views/user/tables.sql @@ -0,0 +1,11 @@ +CREATE TABLE IF NOT EXISTS users ( + id SERIAL PRIMARY KEY, + name TEXT, + password TEXT +); + +CREATE TABLE IF NOT EXISTS tweeds ( + id SERIAL PRIMARY KEY, + content TEXT, + user_id TEXT +); \ No newline at end of file