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

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
Changes from 1 commit
Commits
Show all changes
101 commits
Select commit Hold shift + click to select a range
7ebb1ff
hides all the things
RedSquirrelious Nov 1, 2016
ea47c04
includes debugging gems, omniauth, and all that
RedSquirrelious Nov 1, 2016
7eee457
first commit
RedSquirrelious Nov 1, 2016
627828d
added httparty and foundation gems
RedSquirrelious Nov 1, 2016
2251a3c
search item class, start of
RedSquirrelious Nov 1, 2016
f694c89
api wrapper class, start of
RedSquirrelious Nov 1, 2016
b512954
bundle installed
RedSquirrelious Nov 1, 2016
156aa75
require recipesearchwrapper lib file
RedSquirrelious Nov 1, 2016
79efefc
added constants base_url and auth, renamed id and secret constants, s…
RedSquirrelious Nov 1, 2016
01c4128
added sessions controller
RedSquirrelious Nov 1, 2016
e12da81
added users controller
RedSquirrelious Nov 1, 2016
c9e7646
sessions and users controllers routes
RedSquirrelious Nov 1, 2016
fc51127
user model
RedSquirrelious Nov 1, 2016
e905b4e
added omniauth for google
RedSquirrelious Nov 1, 2016
64c59c1
ignores vcr cassettes
RedSquirrelious Nov 1, 2016
74eec95
added minitest-vcr and webmock
RedSquirrelious Nov 1, 2016
851b1ac
added recipe search class
RedSquirrelious Nov 1, 2016
9e96f5f
Merge pull request #1 from RedSquirrelious/sk-baseline
RedSquirrelious Nov 1, 2016
4b17f96
adding omniauth for google and sessions methods
RedSquirrelious Nov 1, 2016
00e5e73
Merge pull request #2 from RedSquirrelious/sk-omniauth-google
RedSquirrelious Nov 1, 2016
e7f72ad
added recipe search controller for optional features later
RedSquirrelious Nov 1, 2016
2080a48
created test files for lib files
RedSquirrelious Nov 1, 2016
bcf1bdf
Merge pull request #3 from RedSquirrelious/recipe-search-controller
RedSquirrelious Nov 1, 2016
0a1d0f9
simplified initalize
RedSquirrelious Nov 2, 2016
cff3d3e
create initialize method, refine search
RedSquirrelious Nov 2, 2016
800f498
add test the truth
RedSquirrelious Nov 2, 2016
c56328b
add tests
RedSquirrelious Nov 2, 2016
77fb9f1
Merge pull request #4 from RedSquirrelious/sk-make-tests-first
RedSquirrelious Nov 2, 2016
86003ac
fixed typos - thank you Charles
RedSquirrelious Nov 2, 2016
9dc841d
typo - added underscore
RedSquirrelious Nov 2, 2016
1626a29
commented out unwieldy tests
RedSquirrelious Nov 2, 2016
417ec1c
added vcr, webmock, minitest-reporter functionality
RedSquirrelious Nov 2, 2016
deaba24
what the api returns per postman
RedSquirrelious Nov 2, 2016
f48b075
renamed class (recipesearch -> reciperesult), changed file names for …
RedSquirrelious Nov 2, 2016
abc023b
Merge pull request #5 from RedSquirrelious/sk-renaming
RedSquirrelious Nov 2, 2016
44f9c76
fixed typos, updated attr_reader
RedSquirrelious Nov 2, 2016
fed1d2c
added attr_reader, deleted AUTH idea, updated search
RedSquirrelious Nov 3, 2016
8c60bfc
commented out everything for now
RedSquirrelious Nov 3, 2016
a37551a
commented out everything for now
RedSquirrelious Nov 3, 2016
77f79cf
commented out everything for now
RedSquirrelious Nov 3, 2016
59942a4
added tests
RedSquirrelious Nov 3, 2016
c01146c
changed name of cassette
RedSquirrelious Nov 3, 2016
08871be
tweaked initialize recipe
RedSquirrelious Nov 3, 2016
c885369
tweaked initialize, loaded dotenv, made search sample method, made wo…
RedSquirrelious Nov 3, 2016
d3e9fff
sample data to play with
RedSquirrelious Nov 3, 2016
81b7e0e
added search to show method
RedSquirrelious Nov 3, 2016
143f0fa
added rudimentary form, incomplete
RedSquirrelious Nov 3, 2016
0e23b88
call partial
RedSquirrelious Nov 3, 2016
487bf4a
added routes
RedSquirrelious Nov 3, 2016
bfc15b8
updated initialize information to include ingredients, calories etc
RedSquirrelious Nov 3, 2016
f93914c
added pagination possibilities, added ingredients, calories etc to re…
RedSquirrelious Nov 3, 2016
1a30a6f
added search partial
RedSquirrelious Nov 3, 2016
6114ba8
Merge pull request #6 from RedSquirrelious/sk-make-recipe
RedSquirrelious Nov 3, 2016
56c629d
swapped out recipe_searches controller for recipes controller
RedSquirrelious Nov 3, 2016
e4c916a
added search method
RedSquirrelious Nov 3, 2016
c6ab944
added index view
RedSquirrelious Nov 3, 2016
6976a73
added search
RedSquirrelious Nov 3, 2016
7f2c0ec
added recipes routes, deleted recipe_searches routes
RedSquirrelious Nov 3, 2016
8a1dcde
added search partial
RedSquirrelious Nov 3, 2016
c44479f
tweaked search method, wrote notes about show method
RedSquirrelious Nov 4, 2016
d82e3a6
tweaked view
RedSquirrelious Nov 4, 2016
d3a2a30
rudimentary show view
RedSquirrelious Nov 4, 2016
a2c8551
added autoload lib
RedSquirrelious Nov 4, 2016
0604d7d
added additional json info for wrapper
RedSquirrelious Nov 4, 2016
8bde1fd
added additional attributes, fixed typo
RedSquirrelious Nov 4, 2016
99b0fea
fixed typo, added search box code instead of partial, removed details…
RedSquirrelious Nov 4, 2016
282664d
Merge pull request #7 from RedSquirrelious/sk-search-box
RedSquirrelious Nov 4, 2016
41426fb
added code to keep VCR from recording my app_key
RedSquirrelious Nov 4, 2016
e62a368
Merge pull request #8 from RedSquirrelious/sk-clean-cassettes
RedSquirrelious Nov 4, 2016
c342167
working show method
RedSquirrelious Nov 4, 2016
a04b1a5
renamed paths, working link to show
RedSquirrelious Nov 4, 2016
7b782ce
working show view
RedSquirrelious Nov 4, 2016
8a16ba0
streamlined initialize, cleaned up attr, cleaned up uri for search fu…
RedSquirrelious Nov 4, 2016
ae8684f
cleaned up URL, streamlined RecipeResult creation, show method based …
RedSquirrelious Nov 4, 2016
63da273
renamed routes
RedSquirrelious Nov 4, 2016
837644e
Merge pull request #9 from RedSquirrelious/sk-show
RedSquirrelious Nov 4, 2016
92ff56f
added image to show page
RedSquirrelious Nov 4, 2016
ff8444c
Merge pull request #10 from RedSquirrelious/sk-image
RedSquirrelious Nov 4, 2016
e2f8bf6
adds rounding helper that rounds floats without breaking things
RedSquirrelious Nov 4, 2016
b1ce92c
links to outside url, shows ingredients properly
RedSquirrelious Nov 4, 2016
db9d346
adds total daily nutrition info
RedSquirrelious Nov 4, 2016
53c29cc
Merge pull request #11 from RedSquirrelious/sk-clean-ingredients
RedSquirrelious Nov 4, 2016
4342552
added ability to paginate without gems - yay - thx Chris
RedSquirrelious Nov 4, 2016
bd00c2c
working on partial, now matches index search box
RedSquirrelious Nov 4, 2016
5c685ad
updated name of search path
RedSquirrelious Nov 4, 2016
35d27c9
added pagination to search by one keyword, deleted sample test method
RedSquirrelious Nov 4, 2016
d952c0c
added back button to proper list of recipes
RedSquirrelious Nov 4, 2016
3c5b781
added next and back buttons and logic, tweaked search box
RedSquirrelious Nov 4, 2016
43aa056
Merge pull request #13 from RedSquirrelious/sk-more-kaminari
RedSquirrelious Nov 4, 2016
aeb20b0
added will_paginate gem for a page bar
RedSquirrelious Nov 7, 2016
37ce3fa
added a topbar
RedSquirrelious Nov 7, 2016
395db55
removed older instance variables for pages, added logic for will_pagi…
RedSquirrelious Nov 7, 2016
e55587b
added new way of viewing ingredients and nutritional info
RedSquirrelious Nov 7, 2016
8b43621
requires foundation and app css files
RedSquirrelious Nov 7, 2016
10b8052
cleaner search partial, older page variables removed
RedSquirrelious Nov 7, 2016
a4226e2
added pagination, logic, formatting
RedSquirrelious Nov 7, 2016
29a0796
changed list_end variable for some reason
RedSquirrelious Nov 7, 2016
25b858e
initializes will_paginate gem
RedSquirrelious Nov 7, 2016
36e2a6b
makes it foundation-pretty, or offers the possibility, anyhow
RedSquirrelious Nov 7, 2016
12f310d
some thoughts on the project
RedSquirrelious Nov 7, 2016
a3fba93
Merge pull request #14 from RedSquirrelious/sk-will-paginate
RedSquirrelious Nov 7, 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
Prev Previous commit
Next Next commit
requires foundation and app css files
  • Loading branch information
RedSquirrelious committed Nov 7, 2016
commit 8b436211395362924b0f7422b8099d2fe9ea90a7
3 changes: 2 additions & 1 deletion app/assets/stylesheets/application.css
Original file line number Diff line number Diff line change
@@ -12,4 +12,5 @@
*
*= require_tree .
*= require_self
*/
*= require app
*= require foundation */