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

fixed counts #64

Open
wants to merge 75 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
ad1cdc7
functionality workingg
erhessNOLA Nov 7, 2018
bacd1b5
Merge pull request #1 from erhessNOLA/master
Nov 7, 2018
ac83583
Added eslint for vue
Nov 7, 2018
b3e58fb
fixed edamam
Nov 7, 2018
945e009
fixed storing to database
erhessNOLA Nov 7, 2018
c24122f
Merge pull request #7 from erhessNOLA/master
Nov 7, 2018
39b0d64
added discover component
Nov 7, 2018
7089d2a
Merge branch 'master' of https://github.com/Syntactic-SugarCain/green…
Nov 7, 2018
f2611d2
Merge branch 'master' of https://github.com/rawrkhoi/greenfield into …
Nov 7, 2018
5a710fe
Fix merge
Nov 7, 2018
c0b818a
Test to merge to branch
Nov 7, 2018
af87969
Merge branch 'master' of https://github.com/rawrkhoi/greenfield into …
Nov 7, 2018
24f4cee
Fixed merge, branch works
Nov 7, 2018
1de720a
Linter works and most issues fixed site still works
Nov 8, 2018
0a41260
calendar rendering
DejaTrudeaux Nov 8, 2018
d0e0b21
calendar not rendering header
DejaTrudeaux Nov 8, 2018
19bae11
Merge pull request #8 from rawrkhoi/eventbrite
DejaTrudeaux Nov 8, 2018
b16602d
Receiving response from eventbrite + more linting
Nov 8, 2018
3e95a14
calendar example data rendering
DejaTrudeaux Nov 8, 2018
ee0accf
Server side api call works
Nov 8, 2018
78234fb
axios getting events i added, trying to render to calendar
DejaTrudeaux Nov 8, 2018
c2eb948
event rendering to calendar
DejaTrudeaux Nov 8, 2018
898a4e7
Pulling data from server api call to cue component
Nov 9, 2018
d8e5046
dynamic rendering of month and year
DejaTrudeaux Nov 9, 2018
79dcaf0
able to retrieve host name finally
erhessNOLA Nov 9, 2018
dc2cf75
popups rendering when event clicked
DejaTrudeaux Nov 9, 2018
914aac3
Rendering info on discover component, fixed most linting issues
Nov 9, 2018
964c5f3
total events and star count added/fixed
erhessNOLA Nov 9, 2018
821d4f1
average stars now working
erhessNOLA Nov 9, 2018
c69ccbd
added alerts upon giving stars
erhessNOLA Nov 9, 2018
51c22b6
cleared db
erhessNOLA Nov 9, 2018
ad79233
Events render on page w/link updated order on server
Nov 9, 2018
342e4d0
removing db file from git
Nov 9, 2018
5bf788e
Merge pull request #9 from rawrkhoi/eventbrite
erhessNOLA Nov 9, 2018
8b17f99
commit
erhessNOLA Nov 9, 2018
e106a00
Merge branch 'master' of https://github.com/Syntactic-SugarCain/green…
erhessNOLA Nov 9, 2018
b1911da
Merge pull request #11 from erhessNOLA/master
Nov 9, 2018
085dac9
added db file to gitignore and some code cleanup on discover
Nov 9, 2018
fecdc8e
before refactor
DejaTrudeaux Nov 9, 2018
eb60e1a
fixed node modules
DejaTrudeaux Nov 9, 2018
723aae3
Merge branch 'master' of https://github.com/Syntactic-SugarCain/green…
DejaTrudeaux Nov 9, 2018
9b245fe
attempting to merge
DejaTrudeaux Nov 9, 2018
5d85a6c
merged upstream, cleaned lint issues
Nov 9, 2018
f8b944d
Merge branch 'master' of https://github.com/rawrkhoi/greenfield into …
Nov 9, 2018
9686c02
fixed all fixable lint issues
Nov 10, 2018
a2c45b1
calendar renders with events
DejaTrudeaux Nov 10, 2018
8f941ed
Fixed img pos in discover
Nov 10, 2018
00901b0
Merge pull request #12 from rawrkhoi/eventbrite
DejaTrudeaux Nov 10, 2018
1d4617b
Merge branch 'master' of https://github.com/Syntactic-SugarCain/green…
DejaTrudeaux Nov 10, 2018
4b952ce
alerts popping up again
DejaTrudeaux Nov 10, 2018
dfd09ed
Merge branch 'calendar' of https://github.com/DejaTrudeaux/greenfield…
Nov 10, 2018
0431786
new pkg-lock
Nov 10, 2018
667ec5e
exchanged files with working master
Nov 10, 2018
a4a1763
installed calendar rendering on site
Nov 10, 2018
362d872
calendar rendering with events and popup but extra narrow
DejaTrudeaux Nov 10, 2018
654a2e4
calendar rendering, header not working but no errors
DejaTrudeaux Nov 10, 2018
41abb31
calendar rendering with buttons console.logging one month before
DejaTrudeaux Nov 10, 2018
9be8562
data passed from child to parent component
DejaTrudeaux Nov 12, 2018
dd19ce6
november to december and back
DejaTrudeaux Nov 12, 2018
c6327e2
Merge branch 'calendar' of https://github.com/DejaTrudeaux/greenfield…
Nov 12, 2018
1b540e3
Added time on discover
Nov 12, 2018
d83ce9e
Date/Time updated
Nov 12, 2018
3da03a7
calendar going back and forth months
DejaTrudeaux Nov 12, 2018
868646a
fixed time and require login on discover tab
Nov 12, 2018
13740d2
redirects if not logged in
Nov 12, 2018
ab46597
buttons going back and forward
DejaTrudeaux Nov 12, 2018
a286bd3
Merge pull request #13 from rawrkhoi/eventbrite
DejaTrudeaux Nov 12, 2018
14a82fb
Merge branch 'master' of https://github.com/Syntactic-SugarCain/green…
DejaTrudeaux Nov 12, 2018
734f903
ignore sqlite file
DejaTrudeaux Nov 12, 2018
bc80981
Merge pull request #14 from DejaTrudeaux/calendar
Nov 12, 2018
90846e3
Merge branch 'master' of https://github.com/Syntactic-SugarCain/green…
Nov 12, 2018
24f8a1e
Merge pull request #15 from rawrkhoi/calendar
erhessNOLA Nov 12, 2018
c42a792
Linter and calerndar has been merged
Nov 12, 2018
7a60fcb
Fixed event count
Nov 12, 2018
870c244
remove sqlite file
Nov 12, 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
5 changes: 4 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
{
"extends": "airbnb-base"
"extends": [
"airbnb-base",
"plugin:vue/recommended"
]
}
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ npm-debug.log
yarn-error.log
.env
recipe-api-keys.js
*.sqlite
data.sqlite

# Editor directories and files
.idea
Expand Down
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"git.ignoreLimitWarning": true
}
4 changes: 2 additions & 2 deletions PRESS-RELEASE.md
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ If the press release is more than a page and a half, it is probably too long. Ke
Oh, and I also like to write press-releases in what I call "Oprah-speak" for mainstream consumer products. Imagine you're sitting on Oprah's couch and have just explained the product to her, and then you listen as she explains it to her audience. That's "Oprah-speak", not "Geek-speak".

Once the project moves into development, the press release can be used as a touchstone; a guiding light. The product team can ask themselves, "Are we building what is in the press release?" If they find they're spending time building things that aren't in the press release (overbuilding), they need to ask themselves why. This keeps product development focused on achieving the customer benefits and not building extraneous stuff that takes longer to build, takes resources to maintain, and doesn't provide real customer benefit (at least not enough to warrant inclusion in the press release).
-->
-->

## Header ##
Who's Coming To Dinner?

Expand Down
Empty file modified README.md
100644 → 100755
Empty file.
32 changes: 20 additions & 12 deletions db-config.js
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,17 +1,11 @@
/* eslint-disable no-console */
const Sequelize = require('sequelize');
const passwordHash = require('password-hash');

const sequelize = new Sequelize('dinner', 'buckeyedseminole', 'Opspark17', {
host: 'whoscomingtodinner.database.windows.net',
dialect: 'mssql',
dialectOptions: {
encrypt: true,
},
pool: {
max: 5,
min: 0,
idle: 10000,
},
const sequelize = new Sequelize('database', 'root', '', {
host: 'localhost',
dialect: 'sqlite',
storage: 'data.sqlite',
});

sequelize.authenticate()
Expand Down Expand Up @@ -51,6 +45,9 @@ const User = sequelize.define('user', {
Image: {
type: Sequelize.STRING,
},
Event_Count: {
type: Sequelize.INTEGER,
},
});

const Event = sequelize.define('event', {
Expand Down Expand Up @@ -89,6 +86,9 @@ const Event = sequelize.define('event', {
Zip_Code: {
type: Sequelize.INTEGER,
},
Rating: {
type: Sequelize.INTEGER,
},
});

const Message = sequelize.define('message', {
Expand All @@ -103,6 +103,14 @@ const Message = sequelize.define('message', {
},
});

sequelize
.sync({ force: false })
.then((res) => {
console.log('It worked!');
}, (err) => {
console.log('An error occurred while creating the table:', err);
});

// TEST DB-MESSAGE CREATION & QUERY
// Message.sync().then(() => {
// Message.findOrCreate({
Expand Down Expand Up @@ -153,7 +161,7 @@ const Message = sequelize.define('message', {
// const hash = passwordHash.generate('test');
// // TEST password-hash
// User.findOrCreate({
// where: { Email: '[email protected]' },
// where: { Email: '[email protected]' },
// defaults: {
// Name: 'Jake Test',
// Host_Rating: 0,
Expand Down
Empty file modified fb-sdk-script.html
100644 → 100755
Empty file.
10 changes: 6 additions & 4 deletions index.html
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@
<meta charset="utf-8">
<title>PotLucky</title>
<link rel="stylesheet" href="src/css/style.css" />
<script src="scripts/moment.min.js" type="text/javascript"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.0.3/socket.io.js"></script>
<script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyC_L-4LysDxyPUtRJftl4aPOMc9Xkkjsb0" ></script>
<link type="text/css" rel="stylesheet" href="//unpkg.com/bootstrap@next/dist/css/bootstrap.min.css"/>
<script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyBwYF-5hnQAtvcHEx3B9hTnoCKrk5_qFok&callback=initMap" ></script>
<!-- <link type="text/css" rel="stylesheet" href="//unpkg.com/bootstrap@next/dist/css/bootstrap.min.css"/> -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO"
crossorigin="anonymous">
<link href="//netdna.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" rel="stylesheet">
<link type="text/css" rel="stylesheet" href="//unpkg.com/bootstrap-vue@latest/dist/bootstrap-vue.css"/>




</head>
<body>
<div id='app' v-bind:class="{home:home, login: login}">
Expand Down
Loading