Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
10d30cd
made rails project, edamam secrets added to hidden file
BASIC-Belic Oct 31, 2018
9adb64a
added edam api wrapper, recipes contoller and new view -- work in pro…
BASIC-Belic Oct 31, 2018
bceb603
search and basic display of recipe object in list view
BASIC-Belic Nov 1, 2018
e603d4e
search and basic display of recipe object in list view
BASIC-Belic Nov 1, 2018
654bc5e
fix conflicts
BASIC-Belic Nov 1, 2018
4f4ceef
added necessary attr-reader
BASIC-Belic Nov 2, 2018
ec252b1
routes working, now workign on displaying recipe
BASIC-Belic Nov 2, 2018
9879c6a
show view working
BASIC-Belic Nov 2, 2018
2f8d002
slight changes to show view
BASIC-Belic Nov 2, 2018
75291b5
css styling, mostly to home
BASIC-Belic Nov 3, 2018
50ce585
more css to homepage
BASIC-Belic Nov 3, 2018
0ad0b15
aligned the label on homepage
BASIC-Belic Nov 3, 2018
046dcc1
background image
BASIC-Belic Nov 3, 2018
0adc9c6
got navbar to stay fixed to bottom
BASIC-Belic Nov 3, 2018
24f8d19
slight font chnage
BASIC-Belic Nov 3, 2018
6394b77
took background image from other pages other than homepage
BASIC-Belic Nov 3, 2018
c19bc15
lighte rbackground color
BASIC-Belic Nov 3, 2018
c89249a
even lighter background
BASIC-Belic Nov 3, 2018
00019cd
some styling to index
BASIC-Belic Nov 3, 2018
c57aaae
slight css change
BASIC-Belic Nov 3, 2018
db4b4fd
slight css change
BASIC-Belic Nov 3, 2018
8fc85ba
fixed text in search bar
BASIC-Belic Nov 3, 2018
5b1c14b
more small changes to show page
BASIC-Belic Nov 3, 2018
2abe413
more alignment of items on index page
BASIC-Belic Nov 3, 2018
1ad628c
more styling on recipe details
BASIC-Belic Nov 3, 2018
0690f3a
Update Gemfile.lock
BASIC-Belic Nov 4, 2018
219feab
whitespace
BASIC-Belic Nov 4, 2018
6872529
changing routes
BASIC-Belic Nov 4, 2018
4341dbe
added the ugly edamam badge to ugly up my footer, yuck
BASIC-Belic Nov 4, 2018
480e605
altered css so homepage could look better with the new ugly bdage on …
BASIC-Belic Nov 4, 2018
029aaa3
added target: :_blank to link_to to make the link open in new tab
BASIC-Belic Nov 4, 2018
c0c3178
added line to redirect to homepage if no route matches - get '*path' …
BASIC-Belic Nov 4, 2018
60a8b8f
added flash messages, started testing, tests pass thus far
BASIC-Belic Nov 4, 2018
3ea3e48
all tests passing for recipe class
BASIC-Belic Nov 4, 2018
61ce9b6
changed error message
BASIC-Belic Nov 4, 2018
c1d7db0
reworked error message
BASIC-Belic Nov 4, 2018
1625494
changed parameters in edmamam api to go up to 50 in search
BASIC-Belic Nov 4, 2018
ff25547
styling to error messages
BASIC-Belic Nov 4, 2018
55c289e
slight css
BASIC-Belic Nov 4, 2018
caa529f
added nav bar, unstyled and you can now search from any page
BASIC-Belic Nov 4, 2018
100f53e
adde dpartial footer, not showing on show page tho
BASIC-Belic Nov 5, 2018
c840346
started testing apiwrapper, refactored some stuff in apiwrapper
BASIC-Belic Nov 5, 2018
dfff30e
clean up
BASIC-Belic Nov 5, 2018
9a7be89
modified gemfile for heroku
BASIC-Belic Nov 5, 2018
92cf5a1
moved gems outside of test/dev to push to heroku
BASIC-Belic Nov 5, 2018
c4b43a3
created new test yaml
BASIC-Belic Nov 5, 2018
4d70512
addded .strip to user input in search to get rid of trailing whitespace
BASIC-Belic Nov 5, 2018
d03d793
pagination only half working and doing weird thigns to my data
BASIC-Belic Nov 6, 2018
aa4fff7
tests passing, udpated controller and wrapper with new implementation
BASIC-Belic Nov 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
30 changes: 30 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# See https://help.github.com/articles/ignoring-files for more about ignoring files.
#
# If you find yourself ignoring temporary files generated by your text editor
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile '~/.gitignore_global'

# Ignore bundler config.
/.bundle

# Ignore all logfiles and tempfiles.
/log/*
/tmp/*
!/log/.keep
!/tmp/.keep

# Ignore uploaded files in development
/storage/*
!/storage/.keep

/node_modules
/yarn-error.log

/public/assets
.byebug_history

# Ignore master key for decrypting credentials and more.
/config/master.key

#edamam tokens
.env
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ruby-2.5.1
93 changes: 93 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.5.1'

gem 'concurrent-ruby', '~> 1.0', '= 1.0.5'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.2.1'
# Use postgresql as the database for Active Record
gem 'pg', '>= 0.18', '< 2.0'
# Use Puma as the app server
gem 'puma', '~> 3.11'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
# See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'mini_racer', platforms: :ruby

# Use CoffeeScript for .coffee assets and views
# gem 'coffee-rails', '~> 4.2'
# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
gem 'turbolinks', '~> 5'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.5'
# Use Redis adapter to run Action Cable in production
# gem 'redis', '~> 4.0'
# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'

# Use ActiveStorage variant
# gem 'mini_magick', '~> 4.8'

# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development

# Reduces boot times through caching; required in config/boot.rb
gem 'bootsnap', '>= 1.1.0', require: false

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
gem 'httparty'
gem 'dotenv-rails'
gem 'minitest-vcr'
gem 'webmock'
end

group :development do
# Access an interactive console on exception pages or by calling 'console' anywhere in the code.
gem 'web-console', '>= 3.3.0'
gem 'listen', '>= 3.0.5', '< 3.2'
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
gem 'spring-watcher-listen', '~> 2.0.0'
end

group :test do
# Adds support for Capybara system testing and selenium driver
gem 'capybara', '>= 2.15'
gem 'selenium-webdriver'
# Easy installation and use of chromedriver to run system tests with Chrome
gem 'chromedriver-helper'
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

gem 'jquery-rails'
gem 'jquery-turbolinks'
gem 'bootstrap', '~> 4.1.3'
group :development, :test do
gem 'pry-rails'
end

group :development do
gem 'better_errors'
gem 'binding_of_caller'
gem 'guard'
gem 'guard-minitest'
end

group :test do
gem 'minitest-rails'
gem 'minitest-reporters'
end

gem 'httparty'
gem 'dotenv-rails'

#Kaminari paginate
gem 'kaminari'
Loading