Skip to content

Commit

Permalink
Major release
Browse files Browse the repository at this point in the history
Fixed Button in index.html
and form

Added working http to https redirect

Reworked the post request method

Removed Private key.pem from code
  • Loading branch information
FengchiW committed Mar 23, 2020
1 parent 375e808 commit bd6ca59
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 32 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
node_modules/*
db.json
db.json
private.key.pem
domain.cert.pem
25 changes: 14 additions & 11 deletions main.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
var express = require('express');
var app = express();
var httpApp = express();
var fs = require('fs');
var http = require('http')
var server = require('https').createServer({
key: fs.readFileSync("private.key.pem"),
cert: fs.readFileSync("domain.cert.pem")
Expand All @@ -14,7 +16,7 @@ var low = require('lowdb')
const FileSync = require('lowdb/adapters/FileSync')
var profanity = require('profanity-censor');

var dictionary = ['fuck', 'shit', 'nigga', 'ass', 'pussy', 'bitch', 'fucker'];
var dictionary = ['fuck', 'shit', 'nigga', 'pussy', 'bitch', 'fucker'];
profanity.use(dictionary);

var favicon = require('serve-favicon')
Expand All @@ -23,12 +25,9 @@ const adapter = new FileSync('db.json')
const db = low(adapter)
db.defaults({ classes: [], students: [], count: 0 }).write()

var redirectToHTTPS = require('express-http-to-https').redirectToHTTPS

app.use(redirectToHTTPS([/localhost:(\d{4})/], [/\/insecure/], 301));

app.get('/insecure', function(req, res) {
res.send('Dangerous!');
httpApp.set('port', 80);
httpApp.get("*", function(req, res, next) {
res.redirect("https://" + req.headers.host + "/" + req.path);
});

app.use(cookieParser());
Expand Down Expand Up @@ -84,20 +83,20 @@ app.post('/createclass', function(req, res) {
code: code
}).write()

res.end("End")
res.redirect('/phost?session=' + code)
});

app.post('/joinclass', function(req, res) {

var user_name = profanity.filter(req.body.name);
var code = profanity.filter(req.body.code);
var user_name = profanity.filter(req.body.jname)
var code = profanity.filter(req.body.sclass)

db.get('students').push({
name: user_name,
code: code
}).write()

res.end('te')
res.redirect('/class?session=' + code + '&username=' + user_name)
});

app.get('/class', function(req, res) {
Expand Down Expand Up @@ -130,4 +129,8 @@ io.on('connection', function(socket) {
socket.on('mute', function(data) {
socket.broadcast.to(data.room).emit('mute', data)
});
});

http.createServer(httpApp).listen(httpApp.get('port'), function() {
console.log('Express HTTP server listening on port ' + httpApp.get('port'));
});
6 changes: 3 additions & 3 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,14 @@ <h5 class="modal-title" id="joinModalLabel">Join Class</h5>
</button>
</div>
<div class="modal-body">
<form action="" id="joinForm">
<form action="/joinclass" id="joinForm" method='post'>
<div class="form-group">
<label for="jname">Name<span style="color: red;">*</span></label>
<input type="name" class="form-control" id="jname" placeholder="Johnny Mac" required>
<input type="name" class="form-control" id="jname" name="jname" placeholder="Johnny Mac" required>
</div>
<div class="form-group">
<label for="class">Class<span style="color: red;">*</span></label>
<select class="form-control" id="class" required>
<select class="form-control" id="sclass" name="sclass" required>
<option disabled>--Available Classes--</option>
</select>
</div>
Expand Down
20 changes: 3 additions & 17 deletions public/js/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,29 +26,15 @@ function getcookies() {
let o = new Option(schools[i].replace(/%20/g, " ") + " - " + courses[i], codes[i]);
/// jquerify the DOM object 'o' so we can use the html method
$(o).html(schools[i].replace(/%20/g, " ") + " - " + courses[i]);
$("#class").append(o);
$("#sclass").append(o);
}
}


$(document).ready(function() {
// Join class request
$("#joinForm").submit(function() {
let name = $("#jname").val();
let code = $("#class").val();
$.post("/joinclass", {
name: name,
code: code
}, function(data) {
if (data === 'done') {
alert("class created");
} else {
$(location).attr('href', '/class?session=' + code + '&username=' + name);
}
});
});

// Create class request
getcookies()
// Create class request
$("#createForm").submit(function() {
let name = $("#cname").val();
let school = $("#school").val();
Expand Down

0 comments on commit bd6ca59

Please sign in to comment.