5/30/2020

codewithnick · codewithnick · commit 5eed9838f504 · 2020-05-30T01:22:29.000+05:30
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,21 @@
+node_modules
+install_tools.bat      
+nodemon.ps1*  
+sshkey
+CHANGELOG.md  
+LICENSE
+nodevars.bat  
+sshkey.pub
+node.exe*              
+npm*          
+sshkey.txt
+node_etw_provider.man  
+npm.cmd
+ejs*   
+ npx*
+ejs.cmd       
+nodemon*               
+npx.cmd
+ejs.ps1*      
+nodemon.cmd            
+
diff --git a/README.md b/README.md
diff --git a/addmie/css/gaurav.css b/addmie/css/gaurav.css
@@ -1,32 +1,32 @@
-.containers {
+.containerss {
 	box-shadow: 0px 4px 15px 0 rgba(0, 0, 0, 0.2), 0 5px 20px 0 rgba(0, 0, 0, 0.3);
 	float: left;
-	margin: 50px 50px;
+	margin: 50px;
+	margin-left: 190px;
 	}
 
 .float-right{
 	float: right;
-	box-shadow: 0px 4px 15px 0 rgba(0, 0, 0, 0.2), 0 5px 18px 0 rgba(0, 0, 0, 0.3);
+	box-shadow: 0px 4px 15px 0 rgba(0, 0, 0, 0.2), 0 5px 20px 0 rgba(0, 0, 0, 0.3);
 	position: relative;
-	margin-top: 50px;
-	margin-right: 250px;
+	margin: 50px;
+	margin-left: 200px;
 }
 .center {
 	text-align: center;
 	padding: 5px;
 	box-shadow: 0px 4px 15px 0 rgba(0, 0, 0, 0.2);
-	color: red;
+	color: #00b9ed;
 	font-size: 15px;
 }
-.gaurav {
+.form-inside {
 padding: 20px;
 font-size: 15px;
 }
-.gaurav input[type=text], input[type=submit] {
+.form-inside input[type=text], input[type=submit] {
   width: 100%;
   padding: 12px;
   margin: 6px 0;
-  display: inline-block;
   border: 1px solid #ccc;
   box-sizing: border-box;
 }
@@ -36,14 +36,17 @@ font-size: 15px;
   }
   .float-right {
 	  float: left;
-	  margin-right:auto;
-	  margin-left: 50px;
+	  margin-right:40px;
+	  margin-left: 40px;
 	  margin-top: 20px;
   }
+  .containerss {
+	margin: 50px 40px;
+	}
 }
-.gaurav input[type=submit]:hover {
+.form-inside input[type=submit]:hover {
 	background-color: lightblue;
-	color: red;
+	color: #00b9ed;
 	font-size: 15px;
 	box-shadow: 5px 2px 10px black;
 }
diff --git a/addmie/css/styles.css b/addmie/css/styles.css
@@ -2,8 +2,7 @@
     font-family: Arial, Helvetica, sans-serif;
     padding: 0; 
     margin: 0;
-/*      background-color: #010101 ; */
-    color: white;
+    
     font-size: 12px;
     
 }
diff --git a/controllers/controler.js b/controllers/controler.js
@@ -1,7 +1,21 @@
 let path=require('path');
 let bodyparserencoder=require('body-parser');
-//adding session
-
+//connecting to db client 
+let dbconnect=require('../dbconnect/connect');
+const MongoClient=dbconnect.MongoClient;
+const uri=dbconnect.uri;
+const client=dbconnect.client;
+dbconnect.main(client);
+//adding session authentication
+const loginauth=(req,res,next)=>{
+    if(req.session.loggedIn){
+        next();
+        }
+    else{
+            res.redirect('/');
+            console.log('looks like youve been logged out of the session login to continue');
+        }
+};
 bodyparserencoder = bodyparserencoder.urlencoded({ extended: false })
 module.exports=function(app){
     app.get('/',function(req,res){
@@ -12,18 +26,18 @@ module.exports=function(app){
     app.post('/login',bodyparserencoder,function(req,res){
             console.log('login requested');
             let query=require('../'+'dbconnect/'+'login.js');
-            let exists=query.login({username:req.body.Username,password:req.body.Password},res,req);
+            let exists=query.login({username:req.body.User,password:req.body.Pass},res,req,client);
             //console.log('everything done, exists= ' + exists);
             req.session.loggedIn=true;
-            console.log(req.session);
+            //console.log(req.session);
     });
     //request handling when signup is requested
     app.post('/signup',bodyparserencoder,function(req,res){
         console.log('signup requested');
         //if validated sucessfully then fire insert query in database
         let query=require('../'+'dbconnect/'+'newsignin.js');
         //console.log(req.body);
-        query(req.body.Username,req.body.Password,req.body.Fname,req.body.Lname,req.body.DOB,req.body.Email);
+        query(req.body.Username,req.body.Password,req.body.Fname,req.body.Lname,req.body.DOB,req.body.Email,client);
         //window.alert('signed up successfully ,now you can login');
         //now logging in
         query=require('../'+'dbconnect/'+'login.js');
@@ -34,30 +48,34 @@ module.exports=function(app){
     /////////////////////////////////////////////// session pages ////////////////////////////////////////  
     //request handling when logout is requested
     app.get('/logout',function(req,res){
-        console.log(req.session);
+        //console.log(req.session);
         if(req.session.loggedIn){
-        console.log('logout requested');
-        res.render('Addmie.ejs');}
+        req.session.destroy();       
+        }
         else{
-            console.log('login to continue');
+            //console.log('login to continue');
         }
+        res.redirect('/');
+        
     });
     //request handling when user posts
-    app.post('/sendpost/:username',bodyparserencoder,function(req,res){
+    app.post('/sendpost/:username',bodyparserencoder,loginauth,function(req,res){
         console.log('post has been recived');
         var query=require('../dbconnect/insertpost');
-        query(req);
+        query(req,client);
         res.redirect('/profile/'+req.params.username);
     });
-    app.get('/profile/:username',function(req,res){
+    app.get('/profile/:username',loginauth,function(req,res){
         console.log('get request to profile');
         var userobj={
             username:req.params.username,
         };
         let fetch=require('../dbconnect/fetch.js');
         const fname=null;
-        fetch(req.params.username,res);
+        fetch(req.params.username,res,client);
         console.log('profile loaded');
 
     });
+    console.log('closing connection to db');
+    client.close();
 }
diff --git a/dbconnect/connect.js b/dbconnect/connect.js
@@ -1,15 +1,17 @@
 /* JZf111qVS2zqKVfs */
-/* async function listDatabases(client){
+async function listDatabases(client){
     databasesList = await client.db().admin().listDatabases();
  
     console.log("Databases:");
     databasesList.databases.forEach(db => console.log(` - ${db.name}`));
 };
- 
-module.exports=async function main(){
 const MongoClient = require('mongodb').MongoClient;
 const uri = "mongodb+srv://dbuser:JZf111qVS2zqKVfs@addmie-ybdhy.mongodb.net/test?retryWrites=true&w=majority";
 const client = new MongoClient(uri, {useUnifiedTopology:true}); 
+module.exports.MongoClient = MongoClient;
+module.exports.uri=uri;
+module.exports.client=client;
+module.exports.main=async function main(client){
     try {
         // Connect to the MongoDB cluster
         await client.connect();
@@ -20,7 +22,7 @@ const client = new MongoClient(uri, {useUnifiedTopology:true});
     } catch (e) {
         console.error(e);
     } finally {
-        await client.close();
+        console.log('beware the client is still loggeed in the db');
+        //await client.close();
     }
 };
- */
diff --git a/dbconnect/fetch.js b/dbconnect/fetch.js
@@ -1,13 +1,11 @@
-const MongoClient = require('mongodb').MongoClient;
-const uri = "mongodb+srv://dbuser:JZf111qVS2zqKVfs@addmie-ybdhy.mongodb.net/test?retryWrites=true&w=majority";
-const client = new MongoClient(uri, {useUnifiedTopology:true}); 
+
 var result=null;
 var posts=null;
-module.exports = async function dbconnect(from,res)
+module.exports = async function dbconnect(from,res,client)
 {   
        try {
         // Connect to the MongoDB cluster
-        await client.connect();
+        //await client.connect();
         console.log('client connected sucessfully');
         // Make the appropriate DB calls
         result=await client.db('profile').collection('user').findOne({username:from});
@@ -20,7 +18,7 @@ module.exports = async function dbconnect(from,res)
         await res.render('addmie.ejs')
     } finally {
         console.log('closing client connection');
-        await client.close();
+        //await client.close();
         console.log(posts);
         await res.render('profile.ejs',{userobj:result,postobj:posts});
     }
diff --git a/dbconnect/insertpost.js b/dbconnect/insertpost.js
@@ -1,8 +1,5 @@
-const MongoClient = require('mongodb').MongoClient;
-const uri = "mongodb+srv://dbuser:JZf111qVS2zqKVfs@addmie-ybdhy.mongodb.net/test?retryWrites=true&w=majority";
-const client = new MongoClient(uri, {useUnifiedTopology:true}); 
 var result=null;
-module.exports = async function dbconnect(req)
+module.exports = async function dbconnect(req,client)
 {       console.log(req.body.text);
         console.log(req.params.username);
         let today = new Date();
@@ -18,8 +15,8 @@ module.exports = async function dbconnect(req)
         };
        try {
         // Connect to the MongoDB cluster
-        await client.connect();
-        console.log('client connected sucessfully');
+        //await client.connect();
+        //console.log('client connected sucessfully');
         // Make the appropriate DB calls
         result=await client.db('profile').collection('post').insertOne(postobj);
         //console.log(result);
@@ -30,7 +27,7 @@ module.exports = async function dbconnect(req)
 
     } finally {
         console.log('closing client connection');
-        await client.close();
+        //await client.close();
     
     }
 
diff --git a/dbconnect/login.js b/dbconnect/login.js
@@ -3,17 +3,15 @@ var result=null;
 async function fetchuser(client,userobj){
     console.log('finding',userobj);
     result=await client.db('profile').collection('user').findOne(userobj);
-    if(result){console.log('user found'+result.username);exists=true;}
+    if(result){console.log('user found '+result.username);exists=true;}
     else{console.log('invalid username or password');}
    
 };
-module.exports.login=async function main(userobj,res,req){
-    const MongoClient = require('mongodb').MongoClient;
-    const uri = "mongodb+srv://dbuser:JZf111qVS2zqKVfs@addmie-ybdhy.mongodb.net/test?retryWrites=true&w=majority";
-    const client = new MongoClient(uri, {useUnifiedTopology:true}); 
+module.exports.login=async function main(userobj,res,req,client){
+    
     try {
         // Connect to the MongoDB cluster
-        await client.connect();
+        //await client.connect();
         console.log('client connected sucessfully');
         // Make the appropriate DB calls
         await  fetchuser(client,userobj);
@@ -26,24 +24,18 @@ module.exports.login=async function main(userobj,res,req){
     } catch (e) {
         console.error(e);
     } finally {
-        await client.close();
+        //await client.close();
     }
     if(exists){
         console.log(exists);
         req.session.username=result.username;
         console.log('loggin in account of'+result.username);
         res.redirect('/profile/'+result.username);
-        while(true){
-            console.log(req.session.username);
-            if(req.session.username){
-                console.log('session variable created');
-                break;
-            }
-        }
+        
     }
     else{
         console.log('invalid userid or password');
         //window.alert('ivalid username or password');
-        res.render('Addmie.ejs');
+        res.redirect('/');
     }
 }
diff --git a/dbconnect/newsignin.js b/dbconnect/newsignin.js
@@ -4,7 +4,7 @@ async function adduser(client,userobj){
    // console.log(result);
 
 };
-module.exports=async function main(username,password,fname,lname,dob,email){
+module.exports=async function main(username,password,fname,lname,dob,email,client){
     let today = new Date();
     let dd = String(today.getDate()).padStart(2, '0');
     let mm = String(today.getMonth() + 1).padStart(2, '0'); //January is 0!
@@ -20,19 +20,16 @@ module.exports=async function main(username,password,fname,lname,dob,email){
         active:0,
         friends: ['m416','akm']
     };
-    const MongoClient = require('mongodb').MongoClient;
-    const uri = "mongodb+srv://dbuser:JZf111qVS2zqKVfs@addmie-ybdhy.mongodb.net/test?retryWrites=true&w=majority";
-    const client = new MongoClient(uri, {useUnifiedTopology:true}); 
         try {
         // Connect to the MongoDB cluster
-        await client.connect();
+        //await client.connect();
         console.log('client connected sucessfully');
         // Make the appropriate DB calls
         await  adduser(client,userobj);
     } catch (e) {
         console.log('error connecting to db');
         console.error(e);
     } finally {
-        await client.close();
+        //await client.close();
     }
 }
diff --git a/npx b/npx
@@ -0,0 +1,35 @@
+#!/bin/sh
+(set -o igncr) 2>/dev/null && set -o igncr; # cygwin encoding fix
+
+basedir=`dirname "$0"`
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+NODE_EXE="$basedir/node.exe"
+if ! [ -x "$NODE_EXE" ]; then
+  NODE_EXE=node
+fi
+
+NPM_CLI_JS="$basedir/node_modules/npm/bin/npm-cli.js"
+NPX_CLI_JS="$basedir/node_modules/npm/bin/npx-cli.js"
+
+case `uname` in
+  *MINGW*)
+    NPM_PREFIX=`"$NODE_EXE" "$NPM_CLI_JS" prefix -g`
+    NPM_PREFIX_NPX_CLI_JS="$NPM_PREFIX/node_modules/npm/bin/npx-cli.js"
+    if [ -f "$NPM_PREFIX_NPX_CLI_JS" ]; then
+      NPX_CLI_JS="$NPM_PREFIX_NPX_CLI_JS"
+    fi
+    ;;
+  *CYGWIN*)
+    NPM_PREFIX=`"$NODE_EXE" "$NPM_CLI_JS" prefix -g`
+    NPM_PREFIX_NPX_CLI_JS="$NPM_PREFIX/node_modules/npm/bin/npx-cli.js"
+    if [ -f "$NPM_PREFIX_NPX_CLI_JS" ]; then
+      NPX_CLI_JS="$NPM_PREFIX_NPX_CLI_JS"
+    fi
+    ;;
+esac
+
+"$NODE_EXE" "$NPX_CLI_JS" "$@"
diff --git a/views/Addmie.ejs b/views/Addmie.ejs

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,7 @@`
`2`	`2`	`font-family: Arial, Helvetica, sans-serif;`
`3`	`3`	`padding: 0;`
`4`	`4`	`margin: 0;`
`5`		`-/* background-color: #010101 ; */`
`6`		`- color: white;`
	`5`	`+`
`7`	`6`	`font-size: 12px;`
`8`	`7`
`9`	`8`	`}`