Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

States ununited #1

Open
wants to merge 84 commits into
base: aboutPage
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
bce8ca7
Adds Routes, Empty Pug Files, Login JS
Apr 22, 2019
a556628
Skeleton express app for backend api generated using express generato…
QuincyPowell Apr 28, 2019
cfe58e8
Added route files, added dummy JSON data for names route.
QuincyPowell Apr 28, 2019
767d5bd
added test routes to fix npm start crash
kingje47 Apr 29, 2019
592da40
nameRouter has been implemented using dummy JSON data. Other routers …
QuincyPowell Apr 29, 2019
4125b19
Resolved merge conflict, looks like someone else stubbed out the rout…
QuincyPowell Apr 29, 2019
46dd625
Added some extra dummy data JSON files.
QuincyPowell Apr 30, 2019
e85cb24
Added email route, fixed a problem with the filesystem write lackingg…
QuincyPowell May 1, 2019
22e29d0
Everything up to the file write seems to work.
QuincyPowell May 1, 2019
b293711
Fixed an insidious pair of bugs. First involved multiple res.status(x…
QuincyPowell May 1, 2019
5bdb989
Updates Physical Address
May 1, 2019
abb023e
Updates Physical Address
May 1, 2019
af7e77c
Updates Physical Address
May 1, 2019
efd684e
added array to music_pref.json
kingje47 May 1, 2019
20e0782
Merge branch 'api' of https://github.com/Abainesh/FriendsOfNoise into…
kingje47 May 1, 2019
fab062a
uncommented musicPreferencesRouter
kingje47 May 1, 2019
e0d9498
added author comment
kingje47 May 1, 2019
2b13336
Update physical_address.js
May 1, 2019
cb6c49d
Finished email_address route, minor 'pretty code' changes to name route.
QuincyPowell May 1, 2019
6989042
fix import
miscdats May 5, 2019
eb2c534
add routers for all pages so far
miscdats May 5, 2019
1aa2eec
move around some semicolons and periods
miscdats May 5, 2019
dbf84b4
change out formcontainer for login
miscdats May 5, 2019
7c45ab4
signup form labels
miscdats May 5, 2019
d8959e9
add email and password fields to forms
miscdats May 5, 2019
05b3594
set up interim calendar on Calendar page
miscdats May 5, 2019
8a3f483
change link in nav to about
miscdats May 5, 2019
761fda7
change link in nav to about
miscdats May 5, 2019
efbccb8
Merge branch 'dev' of https://github.com/Abainesh/FriendsOfNoise
miscdats May 5, 2019
3e57c18
clean up merge
miscdats May 5, 2019
616a51b
start PricingTable component for membership page
miscdats May 5, 2019
4fb599f
add pricing table to membership info page
miscdats May 5, 2019
d951db7
add a char
miscdats May 5, 2019
8447437
change signin components
miscdats May 5, 2019
92c072d
add tile layout to signin form
miscdats May 5, 2019
5f53897
delete duplicate folder
miscdats May 6, 2019
961d506
change signup form
miscdats May 6, 2019
63ea025
may screenshots update
miscdats May 6, 2019
650d28b
Merge pull request #1 from Abainesh/dev
miscdats May 6, 2019
b2ca824
add music_pref api
kingje47 May 7, 2019
abf1ba0
Update physical_address.js
May 7, 2019
65d48f4
Updates New_Person
May 7, 2019
c5d0d5d
nominal changes
May 7, 2019
4a7234b
merging nominal changes
May 7, 2019
9bfde06
Added route for membership end dates, read and update
QuincyPowell May 8, 2019
89ecc41
Added a comment to physical address route. Started new person route, …
QuincyPowell May 8, 2019
3aba2f1
Rolling back last 2 commits
BobMcHenry May 8, 2019
b0bcb9e
Merge pull request #2 from Abainesh/rollback
ChoiSojung May 8, 2019
d4b08bd
Several fixes to routes. new person route about half done.
QuincyPowell May 8, 2019
ac9c8da
signup labels
miscdats May 13, 2019
b665404
variable name change
miscdats May 14, 2019
2c7c50e
calendar backup
miscdats May 14, 2019
57e0a9f
change calendar to use module bigcalendar
miscdats May 14, 2019
f0232d2
screenshots of examples
miscdats May 14, 2019
9054cc4
change pricing table active classes
miscdats May 14, 2019
622243e
add different calendar
miscdats May 14, 2019
904767e
fix variables import for styles
miscdats May 14, 2019
cc731f6
alterations in style
miscdats May 14, 2019
7fce33b
header and navbar edit size and style
miscdats May 14, 2019
11f3e7e
change calendar size
miscdats May 14, 2019
d16a20f
Merge branch 'dev' of https://github.com/Abainesh/FriendsOfNoise into…
miscdats May 14, 2019
894a856
delete remnants of merge
miscdats May 14, 2019
347128d
Fixed a bug in the music preferences
QuincyPowell May 15, 2019
172964f
Merge remote-tracking branch 'origin/api' into master for front end /…
QuincyPowell May 15, 2019
024ced5
firebase import
miscdats May 19, 2019
c423a9c
Merge pull request #3 from Abainesh/dev
miscdats May 19, 2019
a9d56c0
fix navburger
miscdats May 19, 2019
5f30456
delete testnavbar
miscdats May 19, 2019
6153844
Merge pull request #4 from Abainesh/dev
miscdats May 19, 2019
c8ed784
delete old headerfile
miscdats May 19, 2019
f15d8cd
edit forms handling and display for signup/signin
miscdats May 19, 2019
59fe596
files into new folders
miscdats May 19, 2019
cb891b6
files into modularized folders
miscdats May 20, 2019
6613b88
continue: move sass files
miscdats May 20, 2019
badb037
click on navbar replace purged code
miscdats May 20, 2019
33f521f
debug style imports from last commits
miscdats May 21, 2019
8389423
Merge pull request #5 from Abainesh/dev
miscdats May 21, 2019
78441c9
change backend port to 9000
miscdats May 21, 2019
8abe220
require cors module in backend
miscdats May 21, 2019
9f38b31
test apirouting
miscdats May 21, 2019
73f054d
comment out error prone import from overrides.scss
miscdats May 22, 2019
6555c9d
back+front testAPIs are connected!!!!! next: the actual APIs...
miscdats May 22, 2019
648d05d
rename front App to Client
miscdats May 27, 2019
9ad2153
redux states
miscdats May 28, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions FoNapp/js/login.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
function loginalerts() {
var message;
var username = document.forms["login"]["username"];
var password = document.forms["login"]["password"];

if (username!="" && password!="")) {
message = "Welcome" + username;
} else if(username == "") {
message = "Please enter a valid username";
} else if(password == ""){
message = "Please enter a valid password";
}

alert(message);

}
47 changes: 47 additions & 0 deletions FoNapp/routes/routes.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
var express = require('express');
var router = express.Router();

const { body, validationResult } = require('express-validator/check');



/*INDEX PAGE ROUTES*/
router.get('/', function(req, res, next){
res.render('index', {title: 'Index'})
});




/*LOGIN PAGE ROUTES*/
router.get('/login', function(req, res, next) {
res.render('login', { title: 'Login Page' });
});

/*PROFILE PAGE ROUTES*/
router.post('/profile', function(req, res, next) {
res.render('profile', { title: 'Profile Page' });
});

/*MEMBER PAGE ROUTES*/
router.post('/member', function(req, res, next) {
res.render('member', { title: 'Member Page' });
});

/*ADMIN PAGE ROUTES*/
router.post('/admin', function(req, res, next) {
res.render('admin', { title: 'Admin Page' });
});

/*TICKET PAGE ROUTES*/
router.post('/ticket', function(req, res, next) {
res.render('ticket', { title: 'Ticket Page' });
});

/*EVENT PAGE ROUTES*/
router.get('/event', function(req, res, next) {
res.render('event', { title: 'Event Page' });
});


module.exports = router;
Empty file added FoNapp/views/admin.pug
Empty file.
Empty file added FoNapp/views/event.pug
Empty file.
Empty file added FoNapp/views/member.pug
Empty file.
Empty file added FoNapp/views/profile.pug
Empty file.
Empty file added FoNapp/views/ticket.pug
Empty file.
Empty file added backend_api/.gitignore
Empty file.
36 changes: 36 additions & 0 deletions backend_api/app.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
var express = require('express');
var path = require('path');
var cookieParser = require('cookie-parser');
var logger = require('morgan');
var cors = require("cors");

// member information routes
var physicalAddressRouter = require('./routes/physical_address');
var emailAddressRouter = require('./routes/email_address');
var nameRouter = require('./routes/name');
var membershipEndDateRouter = require('./routes/membership_end_date');
var musicPreferencesRouter = require('./routes/music_preferences');
//var newPersonRouter = require('./routes/new_person');

var app = express();

app.use(cors());
app.use(logger('dev'));
app.use(express.json());
app.use(express.urlencoded({ extended: false }));
app.use(cookieParser());
app.use(express.static(path.join(__dirname, 'public')));
// member information routes
app.use('/physical_address', physicalAddressRouter);
app.use('/email_address', emailAddressRouter);
app.use('/name', nameRouter);
app.use('/member_end_date', membershipEndDateRouter);
app.use('/music_preferences', musicPreferencesRouter);
//app.use('/new_person', newPersonRouter);

// testing integration!!!
// var testAPIRouter = require('./routes/testAPIroute');
// app.use('/testAPI', testAPIRouter);


module.exports = app;
90 changes: 90 additions & 0 deletions backend_api/bin/www
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
#!/usr/bin/env node

/**
* Module dependencies.
*/

var app = require('../app');
var debug = require('debug')('backend-api:server');
var http = require('http');

/**
* Get port from environment and store in Express.
*/

var port = normalizePort(process.env.PORT || '9000');
app.set('port', port);

/**
* Create HTTP server.
*/

var server = http.createServer(app);

/**
* Listen on provided port, on all network interfaces.
*/

server.listen(port);
server.on('error', onError);
server.on('listening', onListening);

/**
* Normalize a port into a number, string, or false.
*/

function normalizePort(val) {
var port = parseInt(val, 10);

if (isNaN(port)) {
// named pipe
return val;
}

if (port >= 0) {
// port number
return port;
}

return false;
}

/**
* Event listener for HTTP server "error" event.
*/

function onError(error) {
if (error.syscall !== 'listen') {
throw error;
}

var bind = typeof port === 'string'
? 'Pipe ' + port
: 'Port ' + port;

// handle specific listen errors with friendly messages
switch (error.code) {
case 'EACCES':
console.error(bind + ' requires elevated privileges');
process.exit(1);
break;
case 'EADDRINUSE':
console.error(bind + ' is already in use');
process.exit(1);
break;
default:
throw error;
}
}

/**
* Event listener for HTTP server "listening" event.
*/

function onListening() {
var addr = server.address();
var bind = typeof addr === 'string'
? 'pipe ' + addr
: 'port ' + addr.port;
debug('Listening on ' + bind);
}
1 change: 1 addition & 0 deletions backend_api/dummy_json_data/email.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"1":{"email":"quincy.powell@gmail.com"},"2":{"email":"someone@somewhere.com"}}
1 change: 1 addition & 0 deletions backend_api/dummy_json_data/member_date.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"1":{"membership_exp_date":"2019-08-08"},"2":{"membership_exp_date":"2019-02-15"}}
6 changes: 6 additions & 0 deletions backend_api/dummy_json_data/music_pref.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"1" : [ "jazz", "classical", "ska", "international"],

"2": ["lofi_hiphop", "pop", "rock"]

}
1 change: 1 addition & 0 deletions backend_api/dummy_json_data/name.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"1":{"first_name":"Quincy","last_name":"Powell"},"2":{"first_name":"Gabby","last_name":"Saechao"}}
1 change: 1 addition & 0 deletions backend_api/dummy_json_data/p_address.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"1":{"address1":"1905 S Rural Rd","address2":"","city":"Buhl","state":"ID","zip":"85256","zip_ext":"4444"},"2":{"address1":"1900 N Urban Way","address2":"","city":"Tukwilla","state":"WA","zip":"98543","zip_ext":""}}
Loading