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

Leticia - API Muncher - Ampers #27

Open
wants to merge 54 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
a1d69fa
Initialized rails files and defined routes and recipes controller
LetiTran May 2, 2018
ec65084
Added gems and api_wrapper and class for it
LetiTran May 2, 2018
038d45f
Created api_wrapper and initial methods
LetiTran May 2, 2018
540e7e6
Added more attributes to recipe and defined id using regex
LetiTran May 2, 2018
e7a93e1
Added functionality of searching for a recipe with a term from a form…
LetiTran May 2, 2018
2a6152a
Added a searching form as a header.
LetiTran May 3, 2018
b0f71d1
Added the right title and text
LetiTran May 3, 2018
d30df2c
Added EdamamApiWrapper#find to search a recipe with an id on the list…
LetiTran May 3, 2018
c517145
Basic view of a recipe implemented.
LetiTran May 4, 2018
1809054
added portion yield to recipe
LetiTran May 4, 2018
0e5afbb
Added basic pagination. needs to fix style.
LetiTran May 4, 2018
38c9453
Fixed that problem with only 10 hits oer request. Now set it to 50
LetiTran May 4, 2018
de8dff4
Fixed that uninitialized constant TestUnit problem
LetiTran May 4, 2018
b6e419a
Changed Recipe to receive a hash as an argument
LetiTran May 4, 2018
21d5fad
Changed argument passed to Recipe a hash as an argument
LetiTran May 4, 2018
d01ffac
Completed tests on Recipe class for now.
LetiTran May 4, 2018
8015743
Added gem for VCR
LetiTran May 4, 2018
8e0df1f
Added VCR config in test_helper file
LetiTran May 4, 2018
c6fbb65
Started tests for api
LetiTran May 4, 2018
83001cd
Added code for openning a link in a new tab.
LetiTran May 6, 2018
e9af3f8
Changed #find to make its own API call
LetiTran May 6, 2018
f40d4ae
Changed #find to make its own API call
LetiTran May 6, 2018
d1e0966
Addapted to only initialize details of a recipe if they are given by …
LetiTran May 6, 2018
82c58e8
Added method for 'Not Found'
LetiTran May 6, 2018
ab976f2
Added call to not_found method if no recipe is returned in #show
LetiTran May 6, 2018
e366b2e
Basic tests for api_wrapper
LetiTran May 6, 2018
bac075b
Deleting unecessary stuff
LetiTran May 6, 2018
f118738
Changed application view to show a resposinve menu and have a search …
LetiTran May 6, 2018
84547f7
Added new icon
LetiTran May 6, 2018
42b7b39
Implemented first steps for basic overall design.
LetiTran May 6, 2018
25c9469
Change button style
LetiTran May 6, 2018
f997653
Fixed button bug
LetiTran May 6, 2018
c77ec50
Trying to fix heroku 'The asset recipe-icon is not present in the ass…
LetiTran May 6, 2018
269ea77
Trying to fix heroku 'The asset recipe-icon is not present in the ass…
LetiTran May 6, 2018
8865f5e
Trying to fix heroku 'The asset recipe-icon is not present in the ass…
LetiTran May 6, 2018
d7ab75c
Trying to fix heroku 'The asset recipe-icon is not present in the ass…
LetiTran May 6, 2018
f91685a
Fixed pagination style
LetiTran May 6, 2018
8385695
Added more style and fixed display of index
LetiTran May 7, 2018
75f91e5
Fixed changes that needed to be done after adding some style to 'card'
LetiTran May 7, 2018
d8a5534
Trying to fix why the search form wont work on heroku
LetiTran May 7, 2018
ce70846
Trying image icon for heroku again
LetiTran May 7, 2018
a98a183
Still testing image
LetiTran May 7, 2018
8d7cc87
Image in home-page working
LetiTran May 7, 2018
3f06f0f
Fixed empty grey box that was apeering when on mobile
LetiTran May 7, 2018
ae47ed0
Fixed bottom of index display
LetiTran May 7, 2018
87e4f81
Added one more api test and deleted unecessary lines
LetiTran May 7, 2018
957b18a
Added flash messages on body
LetiTran May 7, 2018
1b7c911
Changed how #show was dealing with wrong recipe ids and added flash m…
LetiTran May 7, 2018
46d1ee4
Deledt not_found method, not needed here
LetiTran May 7, 2018
9908c3b
Tests for recipes_controller
LetiTran May 7, 2018
2e5797b
Trying to make display of index better
LetiTran May 7, 2018
a4fa400
Finished testing controller
LetiTran May 7, 2018
3364287
Fixed uncentralized root-page card because of changes made for index …
LetiTran May 7, 2018
eb70c5d
Centralized h4
LetiTran 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
28 changes: 28 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# 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/*

/node_modules
/yarn-error.log

/public/assets
.byebug_history

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

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

ruby '2.5.0'

gem 'httparty'

gem 'will_paginate'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.2.0'
# 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]
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', '< 4.0'
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-turbolinks'
gem 'jquery-rails'
gem 'foundation-rails'
gem 'normalize-rails'
group :development, :test do
gem 'pry-rails'
gem 'dotenv-rails'
gem 'minitest-vcr'
gem 'webmock'
end

group :development do
gem 'better_errors'
gem 'binding_of_caller'
end

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