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

API Muncher - Angela - Octos #31

Open
wants to merge 24 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
d053b29
run rails new
knockknockhusthere May 2, 2018
21f69c0
created recipe controller and routes
knockknockhusthere May 2, 2018
c3cc13d
added httparty and figaro to gemfile
knockknockhusthere May 2, 2018
18cc73a
added env files
knockknockhusthere May 2, 2018
7dfc014
added env file and added api wrapper
knockknockhusthere May 2, 2018
9413df4
recipe model tests and api wrapper tests
knockknockhusthere May 2, 2018
748d0e9
wrote list_recipes and added edamam attribute
knockknockhusthere May 3, 2018
13c66c1
testing output for pesto chicken in index views page
knockknockhusthere May 4, 2018
0acd604
linked show page for recipes, editted controller actions
knockknockhusthere May 4, 2018
bdef4a9
FIXED THE SHOW PAGE YAY
knockknockhusthere May 4, 2018
cfe6f11
eager load addition to config/application
knockknockhusthere May 4, 2018
ba06229
added enable dependencies
knockknockhusthere May 4, 2018
2e7de85
remove pry
knockknockhusthere May 4, 2018
ace3624
circular reference fix
knockknockhusthere May 4, 2018
f1b90c9
hid pry gem
knockknockhusthere May 4, 2018
ce7b87a
added paginate
knockknockhusthere May 5, 2018
3590ffa
recipes controller testing for index
knockknockhusthere May 6, 2018
0f6a93d
controller tests for show
knockknockhusthere May 6, 2018
9d1aa69
test added and passing
knockknockhusthere May 6, 2018
5eece16
added a background image
knockknockhusthere May 7, 2018
fdf8717
css changes
knockknockhusthere May 7, 2018
873f692
css for index and show
knockknockhusthere May 7, 2018
bf01469
getting heroku to compile assets
knockknockhusthere May 7, 2018
63d54f4
created footer
knockknockhusthere May 7, 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
Prev Previous commit
Next Next commit
css for index and show
  • Loading branch information
knockknockhusthere committed May 7, 2018
commit 873f6922ab62282eae036cffa79c31c7438e3d06
2 changes: 1 addition & 1 deletion app/assets/stylesheets/application.css
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
border: solid white .3em;
padding: 15px;
padding-bottom: 25px;

}

header {
Expand Down
24 changes: 21 additions & 3 deletions app/assets/stylesheets/recipes.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Place all the styles related to the recipes controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/

.search-form {
width: 50%;
}
Expand All @@ -16,14 +17,31 @@
border: none;
}

.recipe-block
.recipe-block {

display: grid;
width: 95vw;
width: 100vw;
height: 65vh;
grid-template-columns: repeat(4, 1fr);
grid-template-rows: repeat(3,1fr);
list-style-type: none;
justify-content: center;
overflow-y:scroll;
overflow-y: scroll;
padding-right: 2%;
}

.recipe-block a {
color: black;
font-size: 1.2em;
}

.recipe-block a:hover {
color: white;

}

.show-recipe-page {
width: 90vw;
height: 90vh;
overflow-y: scroll;
}
2 changes: 1 addition & 1 deletion app/views/recipes/show.html.erb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<section class="show-page">
<section class="show-recipe-page">

<h2><%=@recipe.label%></h2>
<img src=" <%= @recipe.image %>" alt="recipe photo">
Expand Down