-
Notifications
You must be signed in to change notification settings - Fork 24
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
Mindy takeout and tunes #13
base: master
Are you sure you want to change the base?
Changes from all commits
8dfa6b6
a382c14
a829661
8f51241
8c7e2e5
735db88
14c74e1
ce84ff5
681e355
18cafca
bf7cd22
dab0976
b86287d
7a3f33e
2e2dfc9
1aa37b6
c8156cd
7a36945
faa440a
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
YELP_CONSUMER_KEY: RC-dbM2zuKUQmpuXSeYp5A | ||
YELP_CONSUMER_SECRET: O_YOLmwe2o1IwVsl4-hUVvQn0dM | ||
YELP_TOKEN: KERJPZzNUilFm-RRMdk9V-90kxzYO213 | ||
YELP_TOKEN_SECRET: uLfJRgRSyUporozYTKebsZ81Asc | ||
|
||
|
||
|
||
CLIENT_ID: 84d3407e199f4c9bbbfe6e6e51b9fe0a | ||
|
||
CLIENT_SECRET: 84c0798ce9b94370a384d263efccc892 | ||
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -26,7 +26,7 @@ | |
/tmp/ | ||
|
||
# Used by dotenv library to load environment variables. | ||
# .env | ||
/.env | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. maybe you accidentally added this after already committing the |
||
|
||
## Specific to RubyMotion: | ||
.dat* | ||
|
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/ |
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/ |
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/ |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,97 @@ | ||
|
||
body{ | ||
background-color: rgba(22, 136, 182, 0.85); | ||
} | ||
|
||
.user-stuff{ | ||
display: inline; | ||
} | ||
|
||
.user-stuff image_tag{ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. you might have just meant |
||
border-radius: 50%; | ||
} | ||
|
||
header { | ||
height: 130px; | ||
width: 100%; | ||
padding: 1% 2% 0 2%; | ||
} | ||
|
||
h1{ | ||
font-size: 18px; | ||
} | ||
|
||
.nav{ | ||
background-color: rgba(255, 255, 255, 0.5); | ||
} | ||
|
||
ul.nav li{ | ||
display: inline; | ||
padding-right: 5px; | ||
list-style: none; | ||
font-size: 18px; | ||
font-weight: bold; | ||
padding: 40px; | ||
} | ||
|
||
#suggestion-wrapper { | ||
border: .25rem solid white; | ||
background-color: rgba(255, 255, 255, 0.5); | ||
width: 80%; | ||
overflow: hidden; | ||
margin-bottom: 1.5rem; | ||
margin-left: auto; | ||
margin-right: auto; | ||
} | ||
|
||
#pairing-wrapper { | ||
border: .25rem solid white; | ||
background-color: rgba(255, 255, 255, 0.5); | ||
width: 100%; | ||
height: 40%; | ||
overflow: hidden; | ||
margin-bottom: 1.5rem; | ||
margin-left: auto; | ||
margin-right: auto; | ||
} | ||
|
||
|
||
#food-suggestion { | ||
text-align: center; | ||
width: 49%; | ||
float: left; | ||
} | ||
|
||
#music-suggestion { | ||
text-align: center; | ||
width: 49%; | ||
float: left; | ||
} | ||
|
||
span{ | ||
text-align: center; | ||
width: 49%; | ||
float: right; | ||
} | ||
|
||
iframe { | ||
float: right; | ||
} | ||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
/* | ||
* This is a manifest file that'll be compiled into application.css, which will include all the files | ||
* listed below. | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
// Place all the styles related to the favorites controller here. | ||
// They will automatically be included in application.css. | ||
// You can use Sass (SCSS) here: http://sass-lang.com/ |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
// Place all the styles related to the sessions controller here. | ||
// They will automatically be included in application.css. | ||
// You can use Sass (SCSS) here: http://sass-lang.com/ |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
// Place all the styles related to the suggestions controller here. | ||
// They will automatically be included in application.css. | ||
// You can use Sass (SCSS) here: http://sass-lang.com/ |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,4 +2,9 @@ class ApplicationController < ActionController::Base | |
# Prevent CSRF attacks by raising an exception. | ||
# For APIs, you may want to use :null_session instead. | ||
protect_from_forgery with: :exception | ||
helper_method :current_user | ||
|
||
def current_user | ||
@user ||= User.find_by(id: session[:user_id]) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You can shorten this a little bit (like you did in the suggestions controller!) by just using the |
||
end | ||
end |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oops. Don't want these exposed on github! I think you tried to gitignore them, but it didn't quite happen.