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.

Sign up for GitHub

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

Food Tunes #4

Open
wants to merge 46 commits into
base: master
Choose a base branch
from
Open

Food Tunes #4

Show file tree
Hide file tree
Changes from 45 commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
7533238
some bundling ad yak shaving
jweeber May 16, 2016
32acc60
and more changes to gitignore
jweeber May 16, 2016
f34fa9d
testing secrets
jweeber May 16, 2016
c5dc09e
testing secrets
jweeber May 16, 2016
c11b3c0
removing secrets
jweeber May 16, 2016
b339897
secrets
jweeber May 16, 2016
e599033
what am i doing
jweeber May 16, 2016
461edb7
gitignore
jweeber May 16, 2016
40ee04e
everything
jweeber May 16, 2016
057394e
testing again
jweeber May 16, 2016
36d2298
secrets file from now on, is now hidden
jweeber May 16, 2016
4adf0be
env gem
jweeber May 16, 2016
ce85f87
yelp config file
jweeber May 17, 2016
d2ece66
omniauth file
jweeber May 17, 2016
6335662
starting to work on music model but i don't know what's going on yet.…
jweeber May 17, 2016
1c76eb2
got search term working but returns all suggestions. login with spoti…
jweeber May 17, 2016
0134a65
music model class and method finally working. prints out array right now
jweeber May 18, 2016
e3f859d
got food working from yelp and embedded player working which has imag…
jweeber May 19, 2016
3cc72ff
top 20 pairings for index page working. set up for search for logged …
jweeber May 19, 2016
895c3c7
starting to work on favorite
jweeber May 19, 2016
0ba5f51
user image now pulling from spotify
jweeber May 19, 2016
42cfe64
trying to get favorites to work. getting suggestion id is hard. chang…
jweeber May 19, 2016
2b2328d
I CAN FAVORITE THINGS AND IT WERKS
jweeber May 20, 2016
be36221
gems and files set up for testing models. starting with music.
jweeber May 20, 2016
31652e6
one passing test and one failing
jweeber May 20, 2016
ff8114b
two user model tests completed because i don't know how to do anythin…
jweeber May 20, 2016
75c649a
unfavorites working
jweeber May 21, 2016
b623669
now have a favorites page showing all faves for a user plus link in nav
jweeber May 21, 2016
2fb06de
trying to get a route that includes the search term entered into the …
jweeber May 21, 2016
d8917ba
tests for user model complete including oauth method. all passing.
jweeber May 22, 2016
62698ee
working on wrapper testing. lookin good
jweeber May 22, 2016
0239c45
all test for wrapper complete and passing
jweeber May 22, 2016
f8d5f0c
food model test complete including test for yelp api call
jweeber May 22, 2016
1e18eb6
music model tests complete including method calling to spotify.
jweeber May 22, 2016
f067395
migration to add profile url to users table
jweeber May 22, 2016
06bb2b6
user name and profile image now are links to spotify profile
jweeber May 22, 2016
c223a55
makin stuff look awesome
jweeber May 23, 2016
5b647f8
css done
jweeber May 23, 2016
8cd6e40
trying heroku
jweeber May 23, 2016
292f22d
bundle
jweeber May 23, 2016
9866b72
removing styling thing
jweeber May 23, 2016
71b1063
trying to get images working on heroku
jweeber May 23, 2016
d4566c3
cleaning up routes
jweeber May 23, 2016
1683016
final styling fixes
jweeber May 23, 2016
4d7d066
migration
jweeber May 23, 2016
8c23dca
updating readme with link to finished app
jweeber Jul 12, 2016
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
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
/tmp/

# Used by dotenv library to load environment variables.
# .env
.env

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure If you've had to deal with this, but it's a pain if you accidentally commit something to github that should be secret. So, nice job!

## Specific to RubyMotion:
.dat*
Expand Down Expand Up @@ -63,3 +63,5 @@ build-iPhoneSimulator/

# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
.rvmrc


8 changes: 8 additions & 0 deletions .idea/.generators
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/.rakeTasks
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading