Skip to content

Commit ff76774

Browse files
JulieDeMJulieDeM
committed
updating master, resolved merge conflicts
2 parents 837931f + 6778b9c commit ff76774

17 files changed

+14102
-14154
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
.env
2+
node_modules

‎FBapp.js

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
require('dotenv').config({silent: true});
2+
var express = require('express');
3+
var path = require('path');
4+
var favicon = require('serve-favicon');
5+
var logger = require('morgan');
6+
var cookieParser = require('cookie-parser');
7+
var bodyParser = require('body-parser');
8+
var session = require('express-session');
9+
10+
var routes = require('./routes/index');
11+
var authRoutes = require('./routes/auth');
12+
var newgametypes = require('./routes/newgametypes')
13+
14+
var FacebookStrategy = require('passport-facebook').Strategy;
15+
var passport = require('passport');
16+
var Signup = require('./lib/signup');
17+
18+
var app = express();
19+
20+
app.set('views', path.join(__dirname, 'views'));
21+
app.set('view engine', 'jade');
22+
23+
// uncomment after placing your favicon in /public
24+
//app.use(favicon(path.join(__dirname, 'public', 'favicon.ico')));
25+
app.use(logger('dev'));
26+
app.use(bodyParser.json());
27+
app.use(bodyParser.urlencoded({ extended: false }));
28+
app.use(cookieParser());
29+
app.use(express.static(path.join(__dirname, 'public')));
30+
app.use(session({
31+
keys: [process.env.SESSION_KEY1, process.env.SESSION_KEY2],
32+
secret: 'asdfkjl',
33+
resave: false,
34+
saveUninitialized: true
35+
}))
36+
app.use(passport.initialize());
37+
app.use(passport.session());
38+
39+
passport.use(new FacebookStrategy({
40+
clientID: process.env.FACEBOOK_CLIENT_ID,
41+
clientSecret: process.env.FACEBOOK_CLIENT_SECRET,
42+
callbackURL: process.env.HOST + "/auth/facebook/callback",
43+
redirect: false,
44+
profileFields: ['id', 'name', 'picture.type(large)']
45+
},
46+
function(token, tokenSecret, profile, done) {
47+
Signup.findUser(profile).then(function(user){
48+
if (user.rows.length !== 0) {
49+
done(null, profile);
50+
} else {
51+
Signup.addUser(profile).then(function(){
52+
done(null, profile);
53+
})
54+
}
55+
})
56+
}
57+
));
58+
passport.serializeUser(function(user, done) {
59+
done(null, user);
60+
});
61+
62+
passport.deserializeUser(function(user, done) {
63+
done(null, user)
64+
});
65+
66+
app.use('/', routes);
67+
app.use('/auth', authRoutes);
68+
app.use('/newgame', newgametypes);
69+
70+
71+
// catch 404 and forward to error handler
72+
app.use(function(req, res, next) {
73+
var err = new Error('Not Found');
74+
err.status = 404;
75+
next(err);
76+
});
77+
78+
// development error handler
79+
// will print stacktrace
80+
if (app.get('env') === 'development') {
81+
app.use(function(err, req, res, next) {
82+
res.status(err.status || 500);
83+
res.render('error', {
84+
message: err.message,
85+
error: err
86+
});
87+
});
88+
}
89+
// production error handler
90+
// no stacktraces leaked to user
91+
app.use(function(err, req, res, next) {
92+
res.status(err.status || 500);
93+
res.render('error', {
94+
message: err.message,
95+
error: {}
96+
});
97+
});
98+
99+
module.exports = app;

‎app.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ var cookieParser = require('cookie-parser');
77
var bodyParser = require('body-parser');
88
var session = require('express-session');
99
var routes = require('./routes/index');
10-
var signup = require('./routes/signup');
11-
var dashboard = require('./routes/dashboard');
10+
// var signup = require('./routes/signup');
11+
// var dashboard = require('./routes/dashboard');
1212
var authRoutes = require('./routes/auth');
1313
var newgametypes = require('./routes/newgametypes')
1414
var FacebookStrategy = require('passport-facebook').Strategy;
@@ -65,8 +65,8 @@ passport.deserializeUser(function(user, done) {
6565

6666
app.use('/', routes);
6767
app.use('/auth', authRoutes);
68-
app.use('/signup', signup);
69-
app.use('/dashboard', dashboard);
68+
// app.use('/signup', signup);
69+
// app.use('/dashboard', dashboard);
7070
app.use('/newgame', newgametypes);
7171

7272

‎html/homepage.html

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta charset="utf-8">
5+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
6+
<link href='https://fonts.googleapis.com/css?family=Varela+Round' rel='stylesheet' type='text/css'>
7+
<link rel="stylesheet" href="mainpage.css" media="screen" title="no title" charset="utf-8">
8+
<title></title>
9+
</head>
10+
<script>(function(d, s, id) {
11+
var js, fjs = d.getElementsByTagName(s)[0];
12+
if (d.getElementById(id)) return;
13+
js = d.createElement(s); js.id = id;
14+
js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.7";
15+
fjs.parentNode.insertBefore(js, fjs);
16+
}(document, 'script', 'facebook-jssdk'));</script>
17+
<body>
18+
<div id="banner">
19+
<header>
20+
<img id="logo" href="#" src="[email protected]" alt="mywins"/>
21+
<a href="#" id="signin">sign-in</a>
22+
</header>
23+
</div>
24+
<div id="main-image" >
25+
<div class="bothlandf">
26+
<div id="left">
27+
<p class="kick-butt">Kick butt.</p>
28+
<p class="kick-butt">Take names.</p>
29+
<p class="kick-butt">And keep track of it all.</p>
30+
</div>
31+
<div>
32+
<div id="right">
33+
<div id="yellow">
34+
<div id="gameon">
35+
Game on!
36+
</div>
37+
</div>
38+
<div id="question"> Don't have an account yet? </div>
39+
<a href="/facebook">
40+
<div id="loginfb" ><img src="f.png" id="fbook" hspace="20"/>
41+
<div id="log">
42+
Login with Facebook
43+
</div>
44+
</div>
45+
</a>
46+
<div class="fb-login-button" data-max-rows="1" data-size="xlarge" data-show-faces="false" data-auto-logout-link="false"></div>
47+
</div>
48+
</div>
49+
</div>
50+
<div id="quotes">
51+
<p> "We love this site!" - Bob and Bette</p>
52+
<br>
53+
</div>
54+
</div>
55+
</body>
56+
</html>

‎loadingpage.html renamed to ‎html/loadingpage.html

File renamed without changes.

‎lib/dashlogic.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
var knex = require('../db/knex');
2+
23
module.exports ={
34
createGameType: function(user_id, game_id){
45
return knex.raw(`INSERT into user_games (user_id, game_id) values (${user_id}, ${game_id})`);

‎lib/formValidation.js

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ module.exports ={
33
validateUsername : function(fld){
44
var error = "";
55
var illegalChars = /\W/; // allow letters, numbers, and underscores
6-
var hasUpperCase = function(str){
6+
var hasUpperCase = /\[A-Z]/;
7+
var hasUpperCase = function (str) {
78
return (/[A-Z]/.test(str));
8-
}
9-
9+
};
1010
if (fld.name == "") {
1111
var error = "blank";
1212
console.log(error);
@@ -18,10 +18,9 @@ validateUsername : function(fld){
1818
return error
1919

2020
} else if (hasUpperCase(fld.name)) {
21-
var error = "illegal";
22-
console.log("has upper case");
23-
return error
24-
21+
var error = "illegal";
22+
console.log("has upper case");
23+
return error
2524
} else if (!fld.sport) {
2625
var error = "nosport";
2726
console.log(error);

0 commit comments

Comments
 (0)