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

Jump to bottom

please see my ugly and sort of functional site #84

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

please see my ugly and sort of functional site #84

wants to merge 101 commits into from

Conversation

RedSquirrelious
Copy link

@CheezItMan @PilgrimMemoirs

needs more testing. just couldn't do it. will try to take that on

RedSquirrelious and others added 30 commits October 31, 2016 17:06
@RedSquirrelious
hides all the things
7ebb1ff
@RedSquirrelious
includes debugging gems, omniauth, and all that
ea47c04
@RedSquirrelious
first commit
7eee457
@RedSquirrelious
added httparty and foundation gems
627828d
@RedSquirrelious
search item class, start of
2251a3c
@RedSquirrelious
api wrapper class, start of
f694c89
@RedSquirrelious
bundle installed
b512954
@RedSquirrelious
require recipesearchwrapper lib file
156aa75
@RedSquirrelious
added constants base_url and auth, renamed id and secret constants, s…
79efefc 
…tarted search class method
@RedSquirrelious
added sessions controller
01c4128
@RedSquirrelious
added users controller
e12da81
@RedSquirrelious
sessions and users controllers routes
c9e7646
@RedSquirrelious
user model
fc51127
@RedSquirrelious
added omniauth for google
e905b4e
@RedSquirrelious
ignores vcr cassettes
64c59c1
@RedSquirrelious
added minitest-vcr and webmock
74eec95
@RedSquirrelious
added recipe search class
851b1ac
@RedSquirrelious
Merge pull request #1 from RedSquirrelious/sk-baseline
9e96f5f 
Sk baseline - Chris gave OK
@RedSquirrelious
adding omniauth for google and sessions methods
4b17f96
@RedSquirrelious
Merge pull request #2 from RedSquirrelious/sk-omniauth-google
00e5e73 
adding omniauth for google and sessions methods
@RedSquirrelious
added recipe search controller for optional features later
e7f72ad
@RedSquirrelious
created test files for lib files
2080a48
@RedSquirrelious
Merge pull request #3 from RedSquirrelious/recipe-search-controller
bcf1bdf 
Recipe search controller
@RedSquirrelious
simplified initalize
0a1d0f9
@RedSquirrelious
create initialize method, refine search
cff3d3e
@RedSquirrelious
add test the truth
800f498
@RedSquirrelious
add tests
c56328b
@RedSquirrelious
Merge pull request #4 from RedSquirrelious/sk-make-tests-first
77fb9f1 
Sk make tests first - branching off soon
@RedSquirrelious
fixed typos - thank you Charles
86003ac
@RedSquirrelious
typo - added underscore
9dc841d
RedSquirrelious and others added 29 commits November 4, 2016 12:56
@RedSquirrelious
streamlined initialize, cleaned up attr, cleaned up uri for search fu…
8a16ba0 
…nctionality
@RedSquirrelious
cleaned up URL, streamlined RecipeResult creation, show method based …
ae8684f 
…on uri
@RedSquirrelious
renamed routes
63da273
@RedSquirrelious
Merge pull request #9 from RedSquirrelious/sk-show
837644e 
Sk show
@RedSquirrelious
added image to show page
92ff56f
@RedSquirrelious
Merge pull request #10 from RedSquirrelious/sk-image
ff8444c 
added image to show page
@RedSquirrelious
adds rounding helper that rounds floats without breaking things
e2f8bf6
@RedSquirrelious
links to outside url, shows ingredients properly
b1ce92c
@RedSquirrelious
adds total daily nutrition info
db9d346
@RedSquirrelious
Merge pull request #11 from RedSquirrelious/sk-clean-ingredients
53c29cc 
Sk clean ingredients
@RedSquirrelious
added ability to paginate without gems - yay - thx Chris
4342552
@RedSquirrelious
working on partial, now matches index search box
bd00c2c
@RedSquirrelious
updated name of search path
5c685ad
@RedSquirrelious
added pagination to search by one keyword, deleted sample test method
35d27c9
@RedSquirrelious
added back button to proper list of recipes
d952c0c
@RedSquirrelious
added next and back buttons and logic, tweaked search box
3c5b781
@RedSquirrelious
Merge pull request #13 from RedSquirrelious/sk-more-kaminari
43aa056 
sk working pagination -yay-
@RedSquirrelious
added will_paginate gem for a page bar
aeb20b0
@RedSquirrelious
added a topbar
37ce3fa
@RedSquirrelious
removed older instance variables for pages, added logic for will_pagi…
395db55 
…nate
@RedSquirrelious
added new way of viewing ingredients and nutritional info
e55587b
@RedSquirrelious
requires foundation and app css files
8b43621
@RedSquirrelious
cleaner search partial, older page variables removed
10b8052
@RedSquirrelious
added pagination, logic, formatting
a4226e2
@RedSquirrelious
changed list_end variable for some reason
29a0796
@RedSquirrelious
initializes will_paginate gem
25b858e
@RedSquirrelious
makes it foundation-pretty, or offers the possibility, anyhow
36e2a6b
@RedSquirrelious
some thoughts on the project
12f310d
@RedSquirrelious
Merge pull request #14 from RedSquirrelious/sk-will-paginate
a3fba93 
Sk will paginate
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
parens
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@RedSquirrelious @droberts-sea