Skip to content

Commit

Permalink
Merge pull request #3 from coding-Studio-vbit/master
Browse files Browse the repository at this point in the history 
changes
  • Loading branch information
@Kowshika-Modapalle
Kowshika-Modapalle authored Jan 21, 2021
2 parents f3a719a + cda5d05 commit fe66f39
Show file tree
Hide file tree
Showing 6 changed files with 613 additions and 104 deletions.
1 change: 1 addition & 0 deletions backend/.env
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
p = "saikiran"
16 changes: 16 additions & 0 deletions backend/PasswordManager.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
const express = require("express")
const router = express.Router()

router.post("/generatePassword", (req, res)=>{

})

router.post("/updatePassword", (req, res)=>{

})

router.post("/deletePassword", (req, res)=>{

})

module.exports = router
16 changes: 16 additions & 0 deletions backend/authManager.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
const express = require("express")
const router = express.Router()

/*
Check the details, If they match, CREATE A TOKEN and send it as the response.
Get the authorization header from the request.
Decrypt the token, attach the user object to the request
*/

router.post("/login", (req, res)=>{

})

module.exports = router
8 changes: 7 additions & 1 deletion backend/server.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ app.use(passport.session());
app.get('/', function (req, res) {
res.sendFile("login.html", { root: `${__dirname}/../frontend/` });
})
app.get('/login', function (req, res) {
res.sendFile("login.html", { root: `${__dirname}/../frontend/` });
})
app.get('/register', function (req, res) {
res.sendFile("register.html", { root: `${__dirname}/../frontend/` });
})
app.post('/register',urlencodedParser, (req, res) => {
let {full_name,email,password,password2}=req.body;
const salt = bcrypt.genSaltSync(saltRounds);
Expand All @@ -41,7 +47,7 @@ let values = [full_name, email, myhashpass]
let quer = 'INSERT INTO register(full_name,email, password)values($1, $2, $3)';
pool.query(quer, values, (err, res) => {
console.log(err, res)
pool.end();
//pool.end();
})
res.sendFile("login.html", { root: `${__dirname}/../frontend/` });
})
Expand Down
185 changes: 82 additions & 103 deletions frontend/register.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

<!DOCTYPE html>
<html>
<head>
Expand All @@ -10,14 +9,8 @@


<title>PS/Login Page</title>
<script tpye='text/javascript'>


</script>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.10.0/css/all.min.css" integrity="sha512-PgQMlq+nqFLV4ylk1gwUOgm6CtIIXkKwaIHp/PAIWHzig/lKZSEGKEysh0TCVbHJXCLN7WetD8TFecIky75ZfQ==" crossorigin="anonymous" />


<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" integrity="sha384-JcKb8q3iqJ61gNV9KGb8thSsNjpSL0n8PARn9HuZOnIxN0hoP+VmmDGMN5t9UJ0Z" crossorigin="anonymous">
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" integrity=
"sha384-JcKb8q3iqJ61gNV9KGb8thSsNjpSL0n8PARn9HuZOnIxN0hoP+VmmDGMN5t9UJ0Z" crossorigin="anonymous">
<link rel="stylesheet" type="text/css" media="screen" href="css/global.css">
</head>
<body>
Expand All @@ -26,45 +19,32 @@
<section class="row justify-content-center">
<section class="col-12 col-sm-6 col-md-3" >

<form class="form-box" id="form">
<form action="/register" method="post" class="form-box" >
<div class="form-group">
<label>Username</label>
<input type="text" class="form-control" id="user" aria-describedby="emailHelp" placeholder="Full Name">

<i class="fas fa-check-circle"></i>
<i class="fas fa-exclamation-circle"></i>
<small >Error msg</small>
<label for="full_name">Full Name</label>
<input type="text" class="form-control" id="exampleInputEmail1" aria-describedby="emailHelp" placeholder="Full Name" name="full_name" id="full_name">

</div>

<div class="form-group">
<label>Email address</label>
<input type="email" class="form-control" id="email" aria-describedby="emailHelp" placeholder="Email ID">
<i class="fas fa-check-circle"></i>
<i class="fas fa-exclamation-circle"></i>
<small >Error msg</small>
<label for="email">Email address</label>
<input type="email" class="form-control" id="exampleInputEmail1" aria-describedby="emailHelp" placeholder="Email ID" name="email" id="email">

</div>
<div class="form-group">
<label>Password</label>
<input type="password" class="form-control" id="password" placeholder="Password">
<i class="fas fa-check-circle"></i>
<i class="fas fa-exclamation-circle"></i>
<small >Error msg</small>

<label for="password">Password</label>
<input type="password" class="form-control" id="exampleInputPassword1" placeholder="Password" name="password" id="password">
</div>
<div class="form-group">
<lablel >Confirm Password</lablel>
<input type="confirm password" class="form-control" id="passwordc" placeholder="password">
<i class="fas fa-check-circle"></i>
<i class="fas fa-exclamation-circle"></i>
<small >Error msg</small>
<label for="password2">Confirm Password</label>
<input type="password" class="form-control" id="exampleInputPassword1" placeholder="Password"name="password2" id="password2">
</div>
<div class="form-group form-help">
</div>
<button class="btn btn-primary btn-block">Sign up</button>
<button type="submit" class="btn btn-primary btn-block">Sign up</button>
<center><small><label>Already have an account?<a href="login.html">Login in!</a></label></small></center>
<div class="form-group form-help">


<center><p><label>Already have an account?<a href="login.html">Login in!</a></label></p></center>
</div>
</form>

Expand All @@ -78,73 +58,72 @@
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/umd/popper.min.js" integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js" integrity="sha384-B4gt1jrGC7Jh4AgTPSdUtOBvfO8shuf57BaghqFfPlYxofvL8/KUEfYiJOMMV+rV" crossorigin="anonymous"></script>
</div>
<script type="text/javascript">

const form= document.getElementById('form');
const user= document.getElementById('user');
const email= document.getElementById('email');
const password= document.getElementById('password');
const passwordc= document.getElementById('passwordc');

form.addEventListener('submit',(event) => {
event.preventDefault();})

function Validate(){


const isEmail=(emailVal) =>{
var atSymbol= emailVal.indexOf("@");
if(atSymbol<1) return false;
var dot=emailVal.lastIndexOf('.');
if(dot<= atSymbol+2) return false;
if(dot=== emailVal.length-1) return false;
return true;
}


const validate=() => {

const userVal= user.value.trim();
const emailVal= email.value.trim();
const passwordVal= password.value.trim();
const passwordcVal= passwordc.value.trim();

if(userVal===""){
setErrorMsg(user, "username cannot be blank");

}else if(userVal.length <= 2) {
setErrorMsg(user,"user is min 3 char");
}else {
setSuccessMsg(user);
}



if(emailVal===""){
setErrorMsg(email, "email cannot be blank");

}else if(!isEmail(emailVal)) {
setErrorMsg(emailVal,"user is min 3 char");
}else {
setSuccessMsg(email);
}
function setErrorMsg(input,errormsgs){
const formGroup=input.parentElement;
const small= formGroup.querySelector('small');
formGroup.ClassName="form-group error";
small.innerTEXT=errormsgs;
}

}
}
</script>
<script type="text/javascript">

const form= document.getElementById('form');
const user= document.getElementById('user');
const email= document.getElementById('email');
const password= document.getElementById('password');
const passwordc= document.getElementById('passwordc');

form.addEventListener('submit',(event) => {
event.preventDefault();})

function Validate(){



const isEmail=(emailVal) =>{
var atSymbol= emailVal.indexOf("@");
if(atSymbol<1) return false;
var dot=emailVal.lastIndexOf('.');
if(dot<= atSymbol+2) return false;
if(dot=== emailVal.length-1) return false;
return true;
}


const validate=() => {


const userVal= user.value.trim();
const emailVal= email.value.trim();
const passwordVal= password.value.trim();
const passwordcVal= passwordc.value.trim();

if(userVal===""){
setErrorMsg(user, "username cannot be blank");

}else if(userVal.length <= 2) {
setErrorMsg(user,"user is min 3 char");

}else {
setSuccessMsg(user);
}



if(emailVal===""){
setErrorMsg(email, "email cannot be blank");

}else if(!isEmail(emailVal)) {
setErrorMsg(emailVal,"user is min 3 char");

}else {
setSuccessMsg(email);
}

function setErrorMsg(input,errormsgs){
const formGroup=input.parentElement;
const small= formGroup.querySelector('small');
formGroup.ClassName="form-group error";
small.innerTEXT=errormsgs;

}

}
}

</script>
</body>
</html>

Loading

0 comments on commit fe66f39

Please sign in to comment.