Merged PetitTetonApps with the website now that the deployment server always uses SSL. Used the Apps more recent implementation of NodeJS/Express.
This commit is contained in:
23
app.js
23
app.js
@@ -1,20 +1,21 @@
|
||||
//NOT USED!!!
|
||||
var express = require('express');
|
||||
var path = require('path');
|
||||
var favicon = require('serve-favicon');
|
||||
var logger = require('morgan');
|
||||
var cookieParser = require('cookie-parser');
|
||||
var bodyParser = require('body-parser');
|
||||
var nodemailer = require('nodemailer');
|
||||
//var bodyParser = require('body-parser'); //Dup?
|
||||
var nodeMailer = require('nodeMailer');
|
||||
var bodyParser = require('body-parser');
|
||||
var phantom = require('node-phantom');
|
||||
var fs = require('fs');
|
||||
var rootPath = path.join(__dirname, 'public');
|
||||
var config = require('./config');
|
||||
var moment = require('moment');
|
||||
//var methodOverride = require("method-override");
|
||||
//var session = require("express-session");
|
||||
//var passport = require("passport");
|
||||
//var localStrategy = require("passport-local");
|
||||
var methodOverride = require("method-override");
|
||||
var session = require("express-session");
|
||||
var passport = require("passport");
|
||||
var localStrategy = require("passport-local");
|
||||
|
||||
var app = express();
|
||||
|
||||
@@ -23,10 +24,10 @@ app.use(logger('dev'));
|
||||
app.use(cookieParser());
|
||||
app.use(bodyParser.urlencoded({extended: false}));
|
||||
app.use(bodyParser.json());
|
||||
//app.use(methodOverride('X-HTTP-Method-Override'));
|
||||
//app.use(session({secret: 'au*2(_io?MajesticPeakMountainBoarding', saveUninitialized: true, resave: true}));
|
||||
//app.use(passport.initialize());
|
||||
//app.use(passport.session());
|
||||
app.use(methodOverride('X-HTTP-Method-Override'));
|
||||
app.use(session({secret: 'au*2(_io?MajesticPeakMountainBoarding', saveUninitialized: true, resave: true}));
|
||||
app.use(passport.initialize());
|
||||
app.use(passport.session());
|
||||
|
||||
app.use(favicon(__dirname + '/public/images/Chicken.ico'));
|
||||
app.use(bodyParser.urlencoded({ extended: false }));
|
||||
@@ -70,7 +71,7 @@ app.use('/FrameworkController.java', function(req, res) {
|
||||
});
|
||||
|
||||
//Handle the getting a brief and contacting us.
|
||||
var smtpTransport = nodemailer.createTransport({host: config.smtpHost, port: config.smtpPort, secure: true, ignoreTLS: false, requiresAuth: true, auth: {user: config.smtpUser, pass: config.smtpPassword}});
|
||||
var smtpTransport = nodeMailer.createTransport({host: config.smtpHost, port: config.smtpPort, secure: true, ignoreTLS: false, requiresAuth: true, auth: {user: config.smtpUser, pass: config.smtpPassword}});
|
||||
/*
|
||||
//TEST CODE!!!//
|
||||
try {
|
||||
|
||||
Reference in New Issue
Block a user