43 public/login.html
View file
@@ -120,11 +120,11 @@
<input type="text" name="zipCode" id="zipCode" tabindex="1" class="form-control" placeholder="Zip Code" value="">
</div>
<div class="form-group">
<input type="text" name="password" id="password" tabindex="1" class="form-control" placeholder="Password" value="">
<input type="password" name="password" id="signup-password" tabindex="1" class="form-control" placeholder="Password" value="">

</div>
<div class="form-group">
<input type="text" name="confirm-password" id="confirm-password" tabindex="1" class="form-control" placeholder="Confirm Password"
<input type="password" name="confirm-password" id="confirm-password" tabindex="1" class="form-control" placeholder="Confirm Password"
value="">
</div>
<div class="form-group">
@@ -152,14 +152,14 @@
<div class="container-fluid">
<div class="row">

<!--Copyright-->
<div class="footer-copyright">
<div class="container-fluid">
© 2018 Copyright:
<a href="Horoku.com"> JustATip LLC </a>
<!--Copyright-->
<div class="footer-copyright">
<div class="container-fluid">
© 2018 Copyright:
<a href="Horoku.com"> JustATip LLC </a>

</div>
</div>
</div>
</div>
</footer>
<!--/.Footer-->

@@ -169,6 +169,31 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>

<script src="js/login.js"></script>

<script>
$("#register-submit").on("click", function (event) {
event.preventDefault(); // Here we grab the form elements var currentSurvey

var userInfo = {
username: $("#name").val(),
jobTitle: $("#jobTitle").val(),
hourlyWage: $("#hourlyWage").val(),
zipCode: $("#zipCode").val(),
password: $("#signup-password").val()
}



$.post("/auth/signup", userInfo, function (data) {
console.log(userInfo);
if(!data){
console.log("signup failed");
}


});
});
</script>
</body>

</html>
66 routing/apiRoutes.js
View file
@@ -1,5 +1,48 @@
var db = require("../models");
module.exports = function(app) {
var router = require("express").Router();
var path = require("path");
var moment = require("moment");
var passport = require("passport");

module.exports = function(app,passport) {


app.post('/auth/signup', passport.authenticate('local-signup'
, {
successRedirect: '/auth/success',
failureRedirect: '/auth/failure'
}
),
function (req, res) {
console.log(req);
}
);

app.post('/auth/login', passport.authenticate('local-signin'
,{
successRedirect: '/auth/success',
failureRedirect: '/auth/failure'
}
),
function (req, res) {

}
);

app.get("/auth/success", function (req, res) {
res.json(true);
});

app.get("/auth/failure", function (req, res) {
res.json(false);
});

app.get("/auth/logout", function (req, res) {
req.session.destroy(function (err) {
res.redirect('/');
});
})


// GET route for getting all of the day
app.get("/api/day", function(req, res) {
@@ -23,7 +66,7 @@ module.exports = function(app) {
// POST route for saving a new day


app.post("/api/day", function(req, res) {
app.post("/api/day", isLoggedIn, function(req, res) {
var salary = 5.03;

function dailyWage() {
@@ -43,8 +86,6 @@ module.exports = function(app) {

dailyWage();

console.log('fawad',totalWageDaily);

db.day.create({
input_hours_worked: req.body.hoursWorkedDaily,
input_minutes_worked: req.body.minutesWorkedDaily,
@@ -53,6 +94,7 @@ module.exports = function(app) {
input_daily_wage: totalWageDaily,
input_hourly_wage: totalHourlyDaily,
input_notes: req.body.notes,
input_user_id: req.user.id

}).then(function(dbday) {
// We have access to the new day as an argument inside of the callback function
@@ -65,10 +107,18 @@ module.exports = function(app) {
// req.params.id






router.get("/auth/logout", function (req, res) {
req.session.destroy(function (err) {
res.redirect('/');
});
})

function isLoggedIn(req, res, next) {
if (req.isAuthenticated())
return next();

res.redirect('/');
}

app.delete("/api/day/:id", function(req, res) {
// We just have to specify which day we want to destroy with "where"
7 routing/htmlRouter.js
View file
@@ -8,14 +8,11 @@ module.exports = function(app) {

// Each of the below routes just handles the HTML page that the user gets sent to.

// login page for app
// login and signup page for app
app.get("/", function(req, res) {
res.sendFile(path.join(__dirname, "../public/login.html"));
});
//register for app if there is no account
app.get("/register", function(req, res) {
res.sendFile(path.join(__dirname, "../public/register.html"));
});

// forgot login credentials page
app.get("/forgot", function(req, res) {
res.sendFile(path.join(__dirname, "../public/forgotcode.html"));
13 server.js
View file
@@ -6,6 +6,9 @@
var path = require("path");
var express = require("express");
var bodyParser = require("body-parser");
var passport = require('passport');
var session = require('express-session');
var exphbs = require('express-handlebars');

// ==============================================================================
// EXPRESS CONFIGURATION
@@ -23,7 +26,11 @@ var db = require("./models");
app.use(bodyParser.urlencoded({ extended: true }));
app.use(bodyParser.json());


// For Passport
app.use(session({ secret: 'team JAT', resave: true, saveUninitialized: true })); // session secret
app.use(passport.initialize());
app.use(passport.session()); // persistent login sessions
require('./config/passport/passport.js')(passport, db.user);
// ================================================================================
// Express.static will allow you to set a static directory for things like your
// front end javascript, images, etc
@@ -35,8 +42,8 @@ app.use(express.static(path.join(__dirname,"public")));
// The below points our server to a series of "route" files.
// These routes give our server a "map" of how to respond when users visit or request data from various URLs.
// ================================================================================
require("./routing/apiRoutes")(app);
require("./routing/htmlRouter")(app);
require("./routing/apiRoutes")(app, passport);
require("./routing/htmlRouter")(app, passport);

// =============================================================================
// LISTENER