Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
b1b01dc
add secrets to gitignore;
sophiabaldonado May 16, 2016
375270d
serets;
sophiabaldonado May 16, 2016
1b6e5bd
secrets;
sophiabaldonado May 16, 2016
2630c6e
secrets;
sophiabaldonado May 16, 2016
869c651
Add dotenv gem to gemfile and gitignore;
sophiabaldonado May 16, 2016
bf914ff
Lol we don't need to ignore secrets.yml;
sophiabaldonado May 16, 2016
252807f
Setup controllers, wrappers, and create db;
sophiabaldonado May 17, 2016
53ecdd6
Add routes and user model and views;
sophiabaldonado May 17, 2016
0f9b1cf
Suggestions index works and returns empty suggestions hash;
sophiabaldonado May 17, 2016
663487d
Search form on home page that returns TunesTakeout data;
sophiabaldonado May 17, 2016
7c9671c
Redirect to home page if search returns nil;
sophiabaldonado May 17, 2016
81cb817
Login and logout links and current user method;
sophiabaldonado May 17, 2016
807b96c
You can login with Spotify;
sophiabaldonado May 18, 2016
252ef91
You can logout out too :) ;
sophiabaldonado May 18, 2016
06766c5
Suggestions index shows spotify object based on TunesTakeout output;
sophiabaldonado May 18, 2016
54ed7fc
Sign in with Spotify creates a User correctly;
sophiabaldonado May 18, 2016
e455632
Suggestions displays correct Spotify name, type, link, and images YAY;
sophiabaldonado May 18, 2016
43db3d6
Created food and music models; Extracted music suggestion logic out o…
sophiabaldonado May 18, 2016
b20f5be
sort_suggestions returns an array of hashes that each have a music an…
sophiabaldonado May 18, 2016
ccf3bff
Integrate yelp api;
sophiabaldonado May 19, 2016
4506a99
Yelp info displays on suggestions view;
sophiabaldonado May 19, 2016
94013ad
Suggestions display embeded spotify player;
sophiabaldonado May 19, 2016
917626b
Style the embedded spotify player;
sophiabaldonado May 19, 2016
05feb7a
I think users can favorite a suggestion.. ;
sophiabaldonado May 19, 2016
f84c49a
get favorites is working but post favorite is not;
sophiabaldonado May 19, 2016
ab2973e
You can specify number of search results when you search;
sophiabaldonado May 19, 2016
3469018
Stop rigging search to tacos;
sophiabaldonado May 19, 2016
ac1aa11
You can favorite a suggestion and it rerenders the page correctly;
sophiabaldonado May 19, 2016
ed2c0f0
Start a fake suggestion in case API goes down;
sophiabaldonado May 19, 2016
66fd51e
Merge conflict resolved in TunesTakeoutWrapper and suggestions contro…
sophiabaldonado May 19, 2016
2b2fc15
Store user photo on user create, display spotify name and photo when …
sophiabaldonado May 19, 2016
dc3a96a
Wow i can look at my favorites now;
sophiabaldonado May 19, 2016
1178037
find spotify images by slicing rather than finding a specific width;
sophiabaldonado May 19, 2016
d3c59cc
Use suggestions index for root, destroy home controller, use suggesti…
sophiabaldonado May 19, 2016
161a3c0
Add home and favorites link to nav bar;
sophiabaldonado May 19, 2016
f2c2413
Started user test;
sophiabaldonado May 19, 2016
e9399a5
Create and use method to see if a user has favorited a given suggestion;
sophiabaldonado May 19, 2016
a5aac67
User can unfavorite a suggestion; Method to render the appropriate pa…
sophiabaldonado May 19, 2016
011fde1
Install simplecov;
sophiabaldonado May 19, 2016
f52886d
Favorites button only appears for signed in users;
sophiabaldonado May 19, 2016
4be1e09
Okay user tests are passing holy shit;
sophiabaldonado May 20, 2016
c171f05
Cleaning up and baby refactors i think;
sophiabaldonado May 20, 2016
e025503
Create require login before action;
sophiabaldonado May 21, 2016
fad0d39
cleaning up user create routes and actions;
sophiabaldonado May 21, 2016
6260d2f
Create fake suggestion data cuz aint nobody got time for that;
sophiabaldonado May 21, 2016
2bc24d4
Trying to validate presence of search term;
sophiabaldonado May 21, 2016
3623207
Start styling nav and form with bootstrap;
sophiabaldonado May 21, 2016
aa530e0
Add skip before action require login for session create so you can ac…
sophiabaldonado May 21, 2016
465a79e
Adding boostrap css;
sophiabaldonado May 21, 2016
fb11707
Styling;
sophiabaldonado May 21, 2016
d0f6556
Cleaning stuff up;
sophiabaldonado May 21, 2016
8315f48
Make fake data for styling; Fix Food initialize to not include yelp o…
sophiabaldonado May 22, 2016
05b2e4a
Styling;
sophiabaldonado May 22, 2016
8a62627
Header styling;
sophiabaldonado May 22, 2016
d6823b5
Finish nav styling;
sophiabaldonado May 22, 2016
b6a2a5e
Nav styling;
sophiabaldonado May 22, 2016
07bbcf5
Styling home page and form;
sophiabaldonado May 22, 2016
0b0c03e
Use fake data again..;
sophiabaldonado May 22, 2016
e17497c
Styling suggestions partial;
sophiabaldonado May 22, 2016
9d87c83
Styling;
sophiabaldonado May 22, 2016
d3e3eb8
Display headers on pages;
sophiabaldonado May 23, 2016
03df74f
Styling;
sophiabaldonado May 23, 2016
e7c684c
Styling all done;
sophiabaldonado May 23, 2016
dc27197
TunesTakeoutWrapper tested but can't seem to get the food and music m…
sophiabaldonado May 23, 2016
4ad8160
A couple styling fixes
sophiabaldonado May 23, 2016
d9ffa4e
Not sure why I decided to break favoriting but it works again;
sophiabaldonado May 23, 2016
516ae41
text alignment was bothering me;
sophiabaldonado May 23, 2016
08fe479
Finish fixing favoriting -__-;
sophiabaldonado May 23, 2016
f3e1aab
Finish fixing favoriting -__-;
sophiabaldonado May 23, 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
2 changes: 1 addition & 1 deletion .gitignore
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

## Specific to RubyMotion:
.dat*
Expand Down
27 changes: 25 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,16 @@ gem 'jbuilder', '~> 2.0'
# bundle exec rake doc:rails generates the API under doc/api.
gem 'sdoc', '~> 0.4.0', group: :doc

gem 'httparty'

# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'
gem 'bcrypt', '~> 3.1.7'

gem 'omniauth'
gem 'omniauth-oauth2', '~> 1.3.1'
gem 'yelp'
gem 'rspotify'


# Use Unicorn as the app server
# gem 'unicorn'
Expand All @@ -33,13 +41,28 @@ gem 'sdoc', '~> 0.4.0', group: :doc
group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug'
gem 'dotenv-rails'
gem 'pry-rails'
gem 'minitest-vcr'
gem 'minitest-reporters'
gem 'webmock'
gem 'simplecov'

end

group :development do
# Access an IRB console on exception pages or by using <%= console %> in views
gem 'web-console', '~> 2.0'
gem 'better_errors'
gem 'erd'
gem 'bootstrap-sass', '~>3.2.0'
gem 'autoprefixer-rails'

# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
# gem 'spring'
end

group :production do
gem 'rails_12factor'

end
124 changes: 121 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,24 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.4.0)
ansi (1.5.0)
arel (6.0.3)
autoprefixer-rails (6.3.6.1)
execjs
bcrypt (3.1.11)
better_errors (2.1.1)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
rack (>= 0.9.0)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
bootstrap-sass (3.2.0.2)
sass (~> 3.2)
builder (3.2.2)
byebug (8.2.5)
choice (0.2.0)
coderay (1.1.1)
coffee-rails (4.1.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.1.x)
Expand All @@ -49,11 +62,30 @@ GEM
execjs
coffee-script-source (1.10.0)
concurrent-ruby (1.0.2)
crack (0.4.3)
safe_yaml (~> 1.0.0)
debug_inspector (0.0.2)
docile (1.1.5)
dotenv (2.1.1)
dotenv-rails (2.1.1)
dotenv (= 2.1.1)
railties (>= 4.0, < 5.1)
erd (0.4.0)
nokogiri
rails-erd (>= 0.4.5)
erubis (2.7.0)
execjs (2.6.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
faraday_middleware (0.10.0)
faraday (>= 0.7.4, < 0.10)
globalid (0.3.6)
activesupport (>= 4.1.0)
hashdiff (0.3.0)
hashie (3.4.4)
httparty (0.13.7)
json (~> 1.8)
multi_xml (>= 0.5.2)
i18n (0.7.0)
jbuilder (2.4.1)
activesupport (>= 3.0.0, < 5.1)
Expand All @@ -63,19 +95,53 @@ GEM
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (1.8.3)
jwt (1.5.1)
loofah (2.0.3)
nokogiri (>= 1.5.9)
mail (2.6.4)
mime-types (>= 1.16, < 4)
method_source (0.8.2)
mime-types (3.0)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0221)
mini_portile2 (2.0.0)
minispec-metadata (2.0.0)
minitest
minitest (5.8.4)
minitest-reporters (1.1.9)
ansi
builder
minitest (>= 5.0)
ruby-progressbar
minitest-vcr (1.4.0)
minispec-metadata (~> 2.0)
minitest (>= 4.7.5)
vcr (>= 2.9)
multi_json (1.12.0)
multi_xml (0.5.5)
multipart-post (2.0.0)
netrc (0.7.9)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
oauth2 (1.1.0)
faraday (>= 0.8, < 0.10)
jwt (~> 1.0, < 1.5.2)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
omniauth (1.3.1)
hashie (>= 1.2, < 4)
rack (>= 1.0, < 3)
omniauth-oauth2 (1.3.1)
oauth2 (~> 1.0)
omniauth (~> 1.2)
pg (0.18.4)
pry (0.10.3)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
pry-rails (0.3.4)
pry (>= 0.9.10)
rack (1.6.4)
rack-test (0.6.3)
rack (>= 1.0)
Expand All @@ -96,8 +162,18 @@ GEM
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
rails-erd (1.4.7)
activerecord (>= 3.2)
activesupport (>= 3.2)
choice (~> 0.2.0)
ruby-graphviz (~> 1.2)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.5)
railties (4.2.6)
actionpack (= 4.2.6)
activesupport (= 4.2.6)
Expand All @@ -106,6 +182,14 @@ GEM
rake (11.1.2)
rdoc (4.2.2)
json (~> 1.4)
rest_client (1.8.3)
netrc (~> 0.7.7)
rspotify (1.10.0)
omniauth-oauth2 (~> 1.1)
rest_client (~> 1.8)
ruby-graphviz (1.2.2)
ruby-progressbar (1.8.1)
safe_yaml (1.0.4)
sass (3.4.22)
sass-rails (5.0.4)
railties (>= 4.0.0, < 5.0)
Expand All @@ -116,7 +200,13 @@ GEM
sdoc (0.4.1)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
spring (1.7.1)
simple_oauth (0.3.1)
simplecov (0.11.2)
docile (~> 1.1.0)
json (~> 1.8)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
slop (3.6.0)
sprockets (3.6.0)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
Expand All @@ -131,27 +221,55 @@ GEM
thread_safe (~> 0.1)
uglifier (3.0.0)
execjs (>= 0.3.0, < 3)
vcr (3.0.1)
web-console (2.3.0)
activemodel (>= 4.0)
binding_of_caller (>= 0.7.2)
railties (>= 4.0)
sprockets-rails (>= 2.0, < 4.0)
webmock (2.0.2)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
yelp (2.1.2)
faraday (~> 0.8, >= 0.8.0)
faraday_middleware (~> 0.8, >= 0.8.0)
simple_oauth (~> 0.3.1)

PLATFORMS
ruby

DEPENDENCIES
autoprefixer-rails
bcrypt (~> 3.1.7)
better_errors
bootstrap-sass (~> 3.2.0)
byebug
coffee-rails (~> 4.1.0)
dotenv-rails
erd
httparty
jbuilder (~> 2.0)
jquery-rails
minitest-reporters
minitest-vcr
omniauth
omniauth-oauth2 (~> 1.3.1)
pg (~> 0.15)
pry-rails
rails (= 4.2.6)
rails_12factor
rspotify
sass-rails (~> 5.0)
sdoc (~> 0.4.0)
spring
simplecov
uglifier (>= 1.3.0)
web-console (~> 2.0)
webmock
yelp

RUBY VERSION
ruby 2.3.1p112

BUNDLED WITH
1.12.3
1.12.4
3 changes: 3 additions & 0 deletions app/assets/javascripts/sessions.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/suggestions.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/users.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
Loading