Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
102 commits
Select commit Hold shift + click to select a range
9612144
Remove boilerplate
acdibble Mar 6, 2018
355c5f5
Merge branch 'master' of https://github.com/dabraintrust/tripteaze
acdibble Mar 6, 2018
4202500
Merge pull request #1 from acdibble/master
acdibble Mar 6, 2018
449c937
update gitignore
Mar 6, 2018
7286a63
Add linter and change everything (a/k/a reset to here)
acdibble Mar 6, 2018
2636c6d
fix mongo warning for connect()
Mar 6, 2018
d15f537
Merge pull request #2 from acdibble/master
acdibble Mar 6, 2018
3a68283
fixes deprecated warning
Mar 6, 2018
6c5154c
Merge branch 'master' of https://github.com/dabraintrust/tripteaze in…
Mar 6, 2018
d9fcc35
fix deprecated mongoose warning
Mar 6, 2018
1768353
Merge pull request #3 from ShahzebMeghani/testing
ShahzebMeghani Mar 6, 2018
bf72443
Add newlines
acdibble Mar 6, 2018
430d81d
Remove trailing whitespace
acdibble Mar 6, 2018
ce40e03
Add function binds in constructor
acdibble Mar 6, 2018
762ef36
Allow for submission of login with enter key
acdibble Mar 6, 2018
7475e0c
Add enter key submission for sign up
acdibble Mar 6, 2018
a3b6fdd
Fix server crashing bug
acdibble Mar 6, 2018
9758605
Fix tabs/spacing
acdibble Mar 6, 2018
749de14
drawer view now adjusts main view
rileystevend Mar 6, 2018
d798d59
Remove whitespaces between function names and parenthesis
acdibble Mar 6, 2018
70c5889
Merge pull request #4 from rileystevend/drawerView
rileystevend Mar 6, 2018
cd633b8
Add enter key submission to search page and fix empty search bug
acdibble Mar 6, 2018
afbce6b
Fix spacing after keywords
acdibble Mar 6, 2018
fe2ce8c
Merge branch 'master' of https://github.com/dabraintrust/tripteaze
acdibble Mar 6, 2018
4057aaa
Merge pull request #5 from acdibble/master
acdibble Mar 6, 2018
1b0a64b
Remove bound functions from jsx tags
acdibble Mar 7, 2018
2a953ad
Clean up
acdibble Mar 7, 2018
5531294
Merge branch 'master' of https://github.com/dabraintrust/tripteaze
acdibble Mar 7, 2018
3042e9d
Merge pull request #6 from acdibble/master
acdibble Mar 7, 2018
dfc1ccf
Add alerts if no results found in search
acdibble Mar 7, 2018
273b586
Merge branch 'master' of https://github.com/dabraintrust/tripteaze
acdibble Mar 7, 2018
b8c109a
Implement case-insensitive search for login and registration
acdibble Mar 7, 2018
2acbe93
Merge pull request #7 from acdibble/master
acdibble Mar 7, 2018
9dcdc17
Fix spacing and line length issues
acdibble Mar 7, 2018
b6fe4fb
fixed bug where adding events/food to trips with the same name would …
Mar 7, 2018
a20622d
Merge branch 'master' of https://github.com/dabraintrust/tripteaze
Mar 7, 2018
b207aef
bugfix - add events/restaurants to trips with the same city
ShahzebMeghani Mar 7, 2018
11ebdab
Refactor login and signup to use findOne
acdibble Mar 7, 2018
6e7de58
Merge branch 'master' of https://github.com/dabraintrust/tripteaze
acdibble Mar 7, 2018
5ba210b
Merge pull request #9 from acdibble/master
acdibble Mar 7, 2018
a463efa
merge conflict
rileystevend Mar 7, 2018
39d2642
Merge branch 'master' of https://github.com/dabraintrust/tripteaze
rileystevend Mar 7, 2018
7bd8ae5
Refactor login/sign up
acdibble Mar 7, 2018
2171f7f
Fix unsuccessful join bug
acdibble Mar 7, 2018
fa92a58
Merge branch 'master' of https://github.com/dabraintrust/tripteaze
acdibble Mar 7, 2018
6a02637
Merge pull request #10 from acdibble/master
acdibble Mar 7, 2018
8823f67
Added Actions for Hotels
rileystevend Mar 7, 2018
e0dfc42
Resize header
acdibble Mar 7, 2018
58a3b3e
Merge pull request #11 from acdibble/master
acdibble Mar 7, 2018
9022e24
Added Reducers for Hotels
rileystevend Mar 7, 2018
cefb41e
pass down store and add tripId to functions
Mar 7, 2018
db0bfc3
initial changes to Activity component to incorp hotels
rileystevend Mar 7, 2018
d2e759e
added hotels react component
rileystevend Mar 7, 2018
d980756
refactored Activity component to incorporate hotels now
rileystevend Mar 7, 2018
3d86a07
initial changes to Trip component to incorp hotel
rileystevend Mar 7, 2018
08bd871
food requests is now based on trip id instead of username and city
Mar 7, 2018
c82419c
refactored Trip component to incorporate hotel
rileystevend Mar 7, 2018
45f29a2
refactored userPage component to contain deleteHotel prop passed to T…
rileystevend Mar 7, 2018
2a2f69d
event requests is now based on trip id instead of username and city
Mar 7, 2018
1e83364
Fix page crash on login from userpage
acdibble Mar 7, 2018
e274868
Merge pull request #12 from ShahzebMeghani/fixSidebar
ShahzebMeghani Mar 7, 2018
981da24
Merge branch 'master' of https://github.com/dabraintrust/tripteaze
acdibble Mar 7, 2018
cb1fd4d
Merge pull request #13 from acdibble/master
acdibble Mar 7, 2018
73bf403
added hotel states to initialState in reducer
rileystevend Mar 7, 2018
af4605c
Fix bug where trips wouldn't load upon relogging in
acdibble Mar 7, 2018
959261d
Merge pull request #14 from acdibble/master
acdibble Mar 7, 2018
1416d7c
added and refactored hotels React component
rileystevend Mar 7, 2018
ce34eea
refactored searchpage.jsx rendering to incorp hotels
rileystevend Mar 7, 2018
a3c0b6f
fully refactored searchpage.jsx with hotels incorporated
rileystevend Mar 7, 2018
725c743
homepage changes
rileystevend Mar 8, 2018
d647eac
userpage changes conflict
rileystevend Mar 8, 2018
7b6b2a0
Merge pull request #15 from rileystevend/Hotels
rileystevend Mar 8, 2018
4da791c
Sidebar fixed when adding events. Add promise library to Mongoose
Mar 8, 2018
f5ba4f0
Sidebar fixed when adding restaurants.
Mar 8, 2018
d8e3705
Pull update from master. Hotels commented out as they create problems…
Mar 8, 2018
6ba137e
Merge branch 'master' into fixSidebarAdd
acdibble Mar 8, 2018
95ab57d
Merge pull request #16 from ShahzebMeghani/fixSidebarAdd
acdibble Mar 8, 2018
300ee4c
fixed small typo in hotel actions
rileystevend Mar 8, 2018
9edb494
initial server routes for hotels
rileystevend Mar 8, 2018
6babf4a
app successfully renders hotels on front-end using fill-in Events ser…
rileystevend Mar 8, 2018
e7261d3
added Google helper file and route in server for hotels
rileystevend Mar 8, 2018
f78a4cc
modified server to send google request for hotels
rileystevend Mar 8, 2018
17bb2ec
modified hotel search display in react component
rileystevend Mar 8, 2018
8506502
hotels are able to be searched when creating a trip
rileystevend Mar 8, 2018
2046624
Merge pull request #17 from rileystevend/Hotels
rileystevend Mar 8, 2018
384ebbe
Add hotel delete record function to remove database call
Mar 8, 2018
acdf4c4
hotels now search when clicking search button
rileystevend Mar 8, 2018
0ea5ea6
search hotel field is now just a button (no text box)
rileystevend Mar 8, 2018
fef9955
Merge pull request #18 from rileystevend/Hotels
rileystevend Mar 8, 2018
6b962ca
Add hotel remove request on client
Mar 8, 2018
418dc96
Merge branch 'hotels' of https://github.com/dabraintrust/tripteaze in…
Mar 8, 2018
4d982b5
Merge pull request #19 from ShahzebMeghani/hotels
ShahzebMeghani Mar 8, 2018
8d0e533
merge conflict
rileystevend Mar 8, 2018
9396444
Merge branch 'hotels' of https://github.com/dabraintrust/tripteaze in…
rileystevend Mar 8, 2018
aee29d9
made some changes
rileystevend Mar 8, 2018
311b574
Merge pull request #21 from rileystevend/Hotels
rileystevend Mar 8, 2018
b4b9ab5
cleanup console logs and linting
Mar 9, 2018
82143e0
cleanup console logs and linting
Mar 9, 2018
da69419
Fix deleting hotels from DB
Mar 9, 2018
d0a6ad1
Fix hotel issue and now allows hotels to add and delete without crashing
Mar 9, 2018
5beeb4a
removed yarn.lock
Mar 9, 2018
9a30c6d
Merge pull request #22 from ShahzebMeghani/hotels
ShahzebMeghani Mar 9, 2018
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
84 changes: 84 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
{
"plugins": [
"react",
"react-redux",
"import"
],
"parserOptions": {
"ecmaVersion": 2017,
"sourceType": "module",
"ecmaFeatures": {
"jsx": true
}
},
"env": {
"es6": true,
"browser": true,
"node": true,
"mocha": true
},
"extends": [
"eslint:recommended",
"plugin:react/recommended",
"plugin:react-redux/recommended",
"plugin:import/errors",
"plugin:import/warnings"
],
"rules": {
"eol-last": [
"error",
"always"
],
"import/named": 2,
"indent": [
"error",
2
],
"keyword-spacing": [
"error",
{
"before": true,
"after": true
}
],
"no-console": "off",
"no-case-declarations": "off",
"no-var": "error",
"no-trailing-spaces": "error",
"quotes": [
2,
"single"
],
"semi": [
"error",
"always"
],
"space-before-function-paren": [
"error",
{
"anonymous": "never",
"named": "never",
"asyncArrow": "always"
}
],
"react/jsx-no-undef": 1,
"react/jsx-no-bind": [
2,
{
"allowArrowFunctions": true
}
],
"react/jsx-tag-spacing": [
"error",
{
"closingSlash": "never",
"beforeSelfClosing": "always",
"afterOpening": "never",
"beforeClosing": "allow"
}
],
"react/prop-types": "off",
"react-redux/mapStateToProps-no-store": "off",
"react-redux/prefer-separate-component-file": "off"
}
}
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,6 @@ bundle.js
# see https://npmjs.org/doc/faq.html#Should-I-check-my-node_modules-folder-into-git
node_modules
bower_components

#webstorm
.idea/
72 changes: 36 additions & 36 deletions APIhelper/eventbrite.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,46 +5,46 @@ const moment = require('moment');
let token;

if (!process.env.EVENTBRITE) {
const config = require('../config.js');
token = config.token;
const config = require('../config.js');
token = config.token;
} else {
token = process.env.EVENTBRITE;
token = process.env.EVENTBRITE;
}


let searchEvents = (query, city, fromDate, toDate, cb) => {
let formattedFromDate;
let formattedToDate;
if(fromDate.length <= 10 && toDate.length <= 10) {
formattedFromDate = fromDate;
formattedToDate = toDate;
} else {
formattedFromDate = moment(fromDate).format('YYYY-MM-DD');
formattedToDate = moment(toDate).format('YYYY-MM-DD');
}
let params = {
url: `https://www.eventbriteapi.com/v3/events/search/?q=${query}&location.address=${city}&start_date.range_start=${formattedFromDate}T00:00:00&start_date.range_end=${formattedToDate}T23:59:00&sort_by=date`,
headers: {
'Authorization': `Bearer ${token}`
}
//?expand=name/?token=${token}`
};

function callback(error, response, body) {
if(!error && response.statusCode == 200) {
var info = JSON.parse(body);
cb(null, info.events);
} else {
cb(error,null);
console.log('api not working');
}
}


request(params, callback);

}
let formattedFromDate;
let formattedToDate;

if (fromDate.length <= 10 && toDate.length <= 10) {
formattedFromDate = fromDate;
formattedToDate = toDate;
} else {
formattedFromDate = moment(fromDate).format('YYYY-MM-DD');
formattedToDate = moment(toDate).format('YYYY-MM-DD');
}

let params = {
url: `https://www.eventbriteapi.com/v3/events/search/?q=${query}&location.address=${city}&start_date.range_start=${formattedFromDate}T00:00:00&start_date.range_end=${formattedToDate}T23:59:00&sort_by=date`,
headers: {
'Authorization': `Bearer ${token}`
}
//?expand=name/?token=${token}`
};

function callback(error, response, body) {
if (!error && response.statusCode == 200) {
const info = JSON.parse(body);
cb(null, info.events);
} else {
cb(error,null);
console.log('api not working');
}
}


request(params, callback);

};

module.exports.searchEvents = searchEvents;
40 changes: 40 additions & 0 deletions APIhelper/google.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
const request = require('request');
const moment = require('moment');


let token;

if (!process.env.GOOGLE) {
const config = require('../config.js');
token = config.googleKey;
} else {
token = process.env.GOOGLE;
}


let searchHotels = (/*query, */city,/* fromDate, toDate, */cb) => {

let params = {
url: `https://maps.googleapis.com/maps/api/place/textsearch/json?query=hotels+in+${city}&key=${token}`,
headers: {
'key': `${token}`
}
//?expand=name/?token=${token}`
};

function callback(error, response, body) {
if (!error && response.statusCode == 200) {
const info = JSON.parse(body);
cb(null, info.results);
} else {
cb(error, null);
console.log('hotel api not working');
}
}


request(params, callback);

};

module.exports.searchHotels = searchHotels;
43 changes: 22 additions & 21 deletions APIhelper/zomatoHelper.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,34 @@ const request = require('request');
let key;

if (!process.env.ZOMATO) {
config = require('../config.js');
const config = require('../config.js');
key = config.zomatoKey;
} else {
key = process.env.ZOMATO;
}

let searchForFoods = ( cityId, searchFood, cb ) => {

let params = {
url: `https://developers.zomato.com/api/v2.1/search?entity_id=${cityId}&entity_type=city&q=${searchFood}&count=25`,
headers: {
'user-key': key
}
}
callback = (err, res, body) => {
if(!err && res.statusCode === 200) {
var temp = JSON.parse(body);
};

const callback = (err, res, body) => {
if (!err && res.statusCode === 200) {
let temp = JSON.parse(body);
cb(null, temp.restaurants);
} else {
cb(err, null);
console.log('errrrrrrrr, ', err)
console.log('errrrrrrrr, ', err);
}
}
};

request(params, callback)
request(params, callback);

}
};

let searchForCityId = (city, cb) => {

Expand All @@ -39,19 +39,20 @@ let searchForCityId = (city, cb) => {
headers: {
'user-key': key
}
}
};

callback = (err, res, body) => {
if(!err && res.statusCode === 200) {
const callback = (err, res, body) => {
if (!err && res.statusCode === 200) {
let temp = JSON.parse(body);
cb(null, temp.location_suggestions[0].id);
} else {
cb(err, null);
console.log('errrrrrr, ', err)
try {
cb(null, temp.location_suggestions[0].id);
} catch (e) {
callback(e, null);
}
}
}
request(params, callback)
}
};
request(params, callback);
};

module.exports.searchForCityId = searchForCityId;
module.exports.searchForFoods = searchForFoods;
21 changes: 0 additions & 21 deletions _.editorconfig

This file was deleted.

1 change: 0 additions & 1 deletion _.gitattributes

This file was deleted.

21 changes: 0 additions & 21 deletions _.jshintrc

This file was deleted.

4 changes: 0 additions & 4 deletions _.travis.yml

This file was deleted.

44 changes: 0 additions & 44 deletions _PRESS-RELEASE.md

This file was deleted.

Loading