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

Karis - Edges - API-muncher #44

Open
wants to merge 26 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
2e9d5c2
created new rails app
kimj42 Oct 31, 2018
031fed9
created index new show method for controller
kimj42 Nov 1, 2018
f9b8959
added a show method and added route
kimj42 Nov 2, 2018
64efb2d
fixed routes issue and added form to new view
kimj42 Nov 2, 2018
b853a62
list of all recipe names for the search word shows up in index page
kimj42 Nov 2, 2018
3fc276f
show page for single recipe works now
kimj42 Nov 3, 2018
fae564b
added styling to root pg
kimj42 Nov 3, 2018
ebb128e
basic styling to root pg but needs to be responsive
kimj42 Nov 3, 2018
bf577f6
tried to work on pagination, added gem, but need to work on this on a…
kimj42 Nov 3, 2018
b04ef5d
pagination works for 5 items per list but it seems most have 10 items…
kimj42 Nov 3, 2018
2493949
made link to external website work in show page
kimj42 Nov 3, 2018
103a130
external link pops up as new tab
kimj42 Nov 3, 2018
944958c
made 50 items show up in index page with pagenation
kimj42 Nov 4, 2018
96db008
used bootstrap to style list of food images, not perfect but works
kimj42 Nov 4, 2018
d9e4604
images lined up well but image size not all the same, could not get s…
kimj42 Nov 5, 2018
18a6253
made site work without new and create method but search bar still not…
kimj42 Nov 5, 2018
9e26141
made errors for entering invalid recipe name show up in root page
kimj42 Nov 5, 2018
cb67bef
shows error msg for user that tries to manually write one recipe id
kimj42 Nov 5, 2018
8d8ec8b
added testing for recipe.rb
kimj42 Nov 5, 2018
982a6fe
used cassette and hid token and id for api wrapper testing
kimj42 Nov 5, 2018
582748e
added more tests
kimj42 Nov 5, 2018
c8a1810
fixed form not working in index and show page. completed all testing
kimj42 Nov 6, 2018
cf6a5c9
added testing for recipes controller
kimj42 Nov 6, 2018
e0e9c8f
trying to troubleshoot heroku deployment issue with concurrent ruby
kimj42 Nov 6, 2018
fed11eb
bundle updated
kimj42 Nov 6, 2018
fc1f1d4
still trying to troubleshoot
kimj42 Nov 6, 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
Binary file added .DS_Store
Binary file not shown.
31 changes: 31 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# 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'


# env file
.env

# 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
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
89 changes: 89 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
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'
gem 'will_paginate', '>= 3.1'
# 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 'dotenv-rails'

gem 'minitest-vcr'
gem 'webmock'
end

gem 'httparty'

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
Loading