diff --git a/.gitignore b/.gitignore
index 050c9d95c..2bcb00381 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,5 @@
/log/*
!/log/.keep
/tmp
+.env
+.npm-debug.log
diff --git a/Gemfile b/Gemfile
index b7bd91b6d..c83e7ec45 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,8 +3,7 @@ source 'https://rubygems.org'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.2.7'
-# Use sqlite3 as the database for Active Record
-gem 'sqlite3'
+
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
@@ -38,12 +37,25 @@ gem 'httparty'
# FOUNDATION
gem 'foundation-rails'
+#PAGINATION
+gem 'will_paginate'
+
+group :production do
+ gem 'pg'
+ gem 'rails_12factor'
+end
group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug'
gem 'dotenv-rails'
gem 'better_errors'
+ # # Use sqlite3 as the database for Active Record
+ # gem 'sqlite3'
+
+ #FOR VCR
+ gem 'minitest-vcr'
+ gem 'webmock'
end
group :development do
@@ -53,3 +65,8 @@ group :development do
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
end
+
+group :test do
+ gem 'minitest-reporters'
+ gem 'simplecov'
+end
diff --git a/Gemfile.lock b/Gemfile.lock
index 37af7bf3c..ad78d8f4e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -36,6 +36,8 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
+ addressable (2.4.0)
+ ansi (1.5.0)
arel (6.0.3)
babel-source (5.8.35)
babel-transpiler (0.7.0)
@@ -58,7 +60,10 @@ GEM
execjs
coffee-script-source (1.10.0)
concurrent-ruby (1.0.2)
+ crack (0.4.3)
+ safe_yaml (~> 1.0.0)
debug_inspector (0.0.2)
+ docile (1.1.5)
dotenv (2.1.1)
dotenv-rails (2.1.1)
dotenv (= 2.1.1)
@@ -71,6 +76,7 @@ GEM
sprockets-es6 (>= 0.9.0)
globalid (0.3.7)
activesupport (>= 4.1.0)
+ hashdiff (0.3.0)
httparty (0.14.0)
multi_xml (>= 0.5.2)
i18n (0.7.0)
@@ -90,11 +96,23 @@ GEM
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_portile2 (2.1.0)
+ minispec-metadata (2.0.0)
+ minitest
minitest (5.9.1)
+ minitest-reporters (1.1.12)
+ ansi
+ builder
+ minitest (>= 5.0)
+ ruby-progressbar
+ minitest-vcr (1.4.0)
+ minispec-metadata (~> 2.0)
+ minitest (>= 4.7.5)
+ vcr (>= 2.9)
multi_json (1.12.1)
multi_xml (0.5.5)
nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0)
+ pg (0.19.0)
rack (1.6.4)
rack-test (0.6.3)
rack (>= 1.0)
@@ -117,6 +135,11 @@ GEM
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
+ rails_12factor (0.0.3)
+ rails_serve_static_assets
+ rails_stdout_logging
+ rails_serve_static_assets (0.0.5)
+ rails_stdout_logging (0.0.5)
railties (4.2.7)
actionpack (= 4.2.7)
activesupport (= 4.2.7)
@@ -125,6 +148,8 @@ GEM
rake (11.3.0)
rdoc (4.2.2)
json (~> 1.4)
+ ruby-progressbar (1.8.1)
+ safe_yaml (1.0.4)
sass (3.4.22)
sass-rails (5.0.6)
railties (>= 4.0.0, < 6)
@@ -135,6 +160,11 @@ GEM
sdoc (0.4.2)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
+ simplecov (0.12.0)
+ docile (~> 1.1.0)
+ json (>= 1.8, < 3)
+ simplecov-html (~> 0.10.0)
+ simplecov-html (0.10.0)
spring (2.0.0)
activesupport (>= 4.2)
sprockets (3.7.0)
@@ -148,7 +178,6 @@ GEM
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
- sqlite3 (1.3.12)
thor (0.19.1)
thread_safe (0.3.5)
tilt (2.0.5)
@@ -159,11 +188,17 @@ GEM
thread_safe (~> 0.1)
uglifier (3.0.3)
execjs (>= 0.3.0, < 3)
+ vcr (3.0.3)
web-console (2.3.0)
activemodel (>= 4.0)
binding_of_caller (>= 0.7.2)
railties (>= 4.0)
sprockets-rails (>= 2.0, < 4.0)
+ webmock (2.1.0)
+ addressable (>= 2.3.6)
+ crack (>= 0.3.2)
+ hashdiff
+ will_paginate (3.1.5)
PLATFORMS
ruby
@@ -177,14 +212,20 @@ DEPENDENCIES
httparty
jbuilder (~> 2.0)
jquery-rails
+ minitest-reporters
+ minitest-vcr
+ pg
rails (= 4.2.7)
+ rails_12factor
sass-rails (~> 5.0)
sdoc (~> 0.4.0)
+ simplecov
spring
- sqlite3
turbolinks
uglifier (>= 1.3.0)
web-console (~> 2.0)
+ webmock
+ will_paginate
BUNDLED WITH
1.13.5
diff --git a/app/assets/images/edamam-logo.png b/app/assets/images/edamam-logo.png
new file mode 100644
index 000000000..a1fa0a31b
Binary files /dev/null and b/app/assets/images/edamam-logo.png differ
diff --git a/app/assets/javascripts/recipes.coffee b/app/assets/javascripts/recipes.coffee
new file mode 100644
index 000000000..24f83d18b
--- /dev/null
+++ b/app/assets/javascripts/recipes.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/javascripts/welcome.coffee b/app/assets/javascripts/welcome.coffee
new file mode 100644
index 000000000..24f83d18b
--- /dev/null
+++ b/app/assets/javascripts/welcome.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index f9cd5b348..15cb4e8c1 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -1,15 +1,193 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any styles
- * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
- * file per style scope.
- *
- *= require_tree .
- *= require_self
- */
+@import url('foundation.css');
+@import url('https://fonts.googleapis.com/css?family=Port+Lligat+Sans');
+
+/*HEADER*/
+section.top-bar#main-header {
+ background-color: #5FB49C;
+ border: 1px black solid;
+
+}
+
+header h1 {
+ font-family: 'Port Lligat Sans', sans-serif;
+
+}
+
+header a {
+ color: #302F33;
+}
+
+.search-me {
+ background-color: #FFBA08;
+}
+
+.rounded-edges {
+ border-radius: 15px;
+
+}
+
+ul.top-bar-right {
+ width: 105%;
+}
+
+ul.menu {
+ background-color: transparent;
+}
+
+.pagination a, span, em {
+ float:left;
+}
+
+ul.top-bar-right {
+ padding-top: 1%;
+}
+
+ul.top-bar-right li {
+ padding-left: 1%;
+}
+
+/*INDEX PAGE*/
+ul p.centered {
+ margin-left: auto;
+ margin-right: auto;
+}
+
+.page-title {
+ font-family: 'Port Lligat Sans', sans-serif;
+ width: auto;
+ margin: 4% 3% 3% 3%;
+ border: 1px black solid;
+}
+
+.img-titles {
+ text-align: center;
+}
+
+.centered {
+ text-align: center;
+ margin: 1%;
+}
+
+.bkgrnd-color-white {
+ background-color: white;
+ border-radius: 15px;
+}
+
+.backgrnd-color-yellow {
+ background-color: #FFBA08;
+ border-radius: 15px;
+}
+
+.bkgrnd-color-yellow-sqr {
+ background-color: #FFBA08;
+}
+
+.bkgrnd-color-teal {
+ background-color: #5FB49C;
+ border-radius: 15px;
+}
+
+.no-bullet {
+ list-style: none;
+}
+.indent {
+ padding: 2% 6% 2% 6%;
+}
+
+.left-indent {
+ padding-left: 2%
+}
+
+.incr-padding {
+ padding: 1%;
+}
+
+.margin {
+ margin: 2%;
+}
+
+.add-margin-bot {
+ margin-bottom: 5%
+}
+
+/*.add-padding {
+ padding: 1% 2% 1% 2%;
+}*/
+
+.text-center {
+ text-align: center;
+}
+
+.show-box {
+ margin: 1% 1% 1% 1%;
+}
+
+.change-font {
+ font-family: 'Port Lligat Sans', sans-serif;
+}
+
+.no-padding {
+ padding: 1% 0 0 1%;
+}
+
+.padding-bot {
+ padding-bottom: 2%;
+}
+
+.padding-top {
+ padding-top: 2%;
+}
+
+.show-img-size {
+ width: 90%;
+ border: black solid 10px;
+}
+
+.show-info {
+ margin: 0%;
+ border: black solid 3px;
+}
+
+.underline {
+ border-bottom: black solid 1px;
+}
+
+.dash-underline {
+ border-bottom: black dashed 1px;
+}
+
+.increase-font {
+ font-size: 150%;
+}
+
+.add-border {
+ border: 1px black solid;
+ border-radius: 15px;
+}
+
+.add-padding {
+ padding: 2%;
+}
+
+.ingredient-show {
+ margin: 0
+}
+
+
+/*FOOTER*/
+footer {
+ background-color: #5FB49C;
+ padding: 1%;
+ border: 1px black solid;
+}
+
+footer div p.small-9 {
+ padding-top: 2%;
+}
+
+.logo {
+ width:120px;
+ background-color: white;
+ border-radius: 10px;
+ padding: 2%;
+}
diff --git a/app/assets/stylesheets/foundation.css b/app/assets/stylesheets/foundation.css
new file mode 100644
index 000000000..66aca962d
--- /dev/null
+++ b/app/assets/stylesheets/foundation.css
@@ -0,0 +1,4194 @@
+@charset "UTF-8";
+/**
+ * Foundation for Sites by ZURB
+ * Version 6.2.3
+ * foundation.zurb.com
+ * Licensed under MIT Open Source
+ */
+/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */
+/**
+ * 1. Set default font family to sans-serif.
+ * 2. Prevent iOS and IE text size adjust after device orientation change,
+ * without disabling user zoom.
+ */
+html {
+ font-family: sans-serif;
+ /* 1 */
+ -ms-text-size-adjust: 100%;
+ /* 2 */
+ -webkit-text-size-adjust: 100%;
+ /* 2 */ }
+
+/**
+ * Remove default margin.
+ */
+body {
+ margin: 0; }
+
+/* HTML5 display definitions
+ ========================================================================== */
+/**
+ * Correct `block` display not defined for any HTML5 element in IE 8/9.
+ * Correct `block` display not defined for `details` or `summary` in IE 10/11
+ * and Firefox.
+ * Correct `block` display not defined for `main` in IE 11.
+ */
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+main,
+menu,
+nav,
+section,
+summary {
+ display: block; }
+
+/**
+ * 1. Correct `inline-block` display not defined in IE 8/9.
+ * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.
+ */
+audio,
+canvas,
+progress,
+video {
+ display: inline-block;
+ /* 1 */
+ vertical-align: baseline;
+ /* 2 */ }
+
+/**
+ * Prevent modern browsers from displaying `audio` without controls.
+ * Remove excess height in iOS 5 devices.
+ */
+audio:not([controls]) {
+ display: none;
+ height: 0; }
+
+/**
+ * Address `[hidden]` styling not present in IE 8/9/10.
+ * Hide the `template` element in IE 8/9/10/11, Safari, and Firefox < 22.
+ */
+[hidden],
+template {
+ display: none; }
+
+/* Links
+ ========================================================================== */
+/**
+ * Remove the gray background color from active links in IE 10.
+ */
+a {
+ background-color: transparent; }
+
+/**
+ * Improve readability of focused elements when they are also in an
+ * active/hover state.
+ */
+a:active,
+a:hover {
+ outline: 0; }
+
+/* Text-level semantics
+ ========================================================================== */
+/**
+ * Address styling not present in IE 8/9/10/11, Safari, and Chrome.
+ */
+abbr[title] {
+ border-bottom: 1px dotted; }
+
+/**
+ * Address style set to `bolder` in Firefox 4+, Safari, and Chrome.
+ */
+b,
+strong {
+ font-weight: bold; }
+
+/**
+ * Address styling not present in Safari and Chrome.
+ */
+dfn {
+ font-style: italic; }
+
+/**
+ * Address variable `h1` font-size and margin within `section` and `article`
+ * contexts in Firefox 4+, Safari, and Chrome.
+ */
+h1 {
+ font-size: 2em;
+ margin: 0.67em 0; }
+
+/**
+ * Address styling not present in IE 8/9.
+ */
+mark {
+ background: #ff0;
+ color: #000; }
+
+/**
+ * Address inconsistent and variable font size in all browsers.
+ */
+small {
+ font-size: 80%; }
+
+/**
+ * Prevent `sub` and `sup` affecting `line-height` in all browsers.
+ */
+sub,
+sup {
+ font-size: 75%;
+ line-height: 0;
+ position: relative;
+ vertical-align: baseline; }
+
+sup {
+ top: -0.5em; }
+
+sub {
+ bottom: -0.25em; }
+
+/* Embedded content
+ ========================================================================== */
+/**
+ * Remove border when inside `a` element in IE 8/9/10.
+ */
+img {
+ border: 0; }
+
+/**
+ * Correct overflow not hidden in IE 9/10/11.
+ */
+svg:not(:root) {
+ overflow: hidden; }
+
+/* Grouping content
+ ========================================================================== */
+/**
+ * Address margin not present in IE 8/9 and Safari.
+ */
+figure {
+ margin: 1em 40px; }
+
+/**
+ * Address differences between Firefox and other browsers.
+ */
+hr {
+ box-sizing: content-box;
+ height: 0; }
+
+/**
+ * Contain overflow in all browsers.
+ */
+pre {
+ overflow: auto; }
+
+/**
+ * Address odd `em`-unit font size rendering in all browsers.
+ */
+code,
+kbd,
+pre,
+samp {
+ font-family: monospace, monospace;
+ font-size: 1em; }
+
+/* Forms
+ ========================================================================== */
+/**
+ * Known limitation: by default, Chrome and Safari on OS X allow very limited
+ * styling of `select`, unless a `border` property is set.
+ */
+/**
+ * 1. Correct color not being inherited.
+ * Known issue: affects color of disabled elements.
+ * 2. Correct font properties not being inherited.
+ * 3. Address margins set differently in Firefox 4+, Safari, and Chrome.
+ */
+button,
+input,
+optgroup,
+select,
+textarea {
+ color: inherit;
+ /* 1 */
+ font: inherit;
+ /* 2 */
+ margin: 0;
+ /* 3 */ }
+
+/**
+ * Address `overflow` set to `hidden` in IE 8/9/10/11.
+ */
+button {
+ overflow: visible; }
+
+/**
+ * Address inconsistent `text-transform` inheritance for `button` and `select`.
+ * All other form control elements do not inherit `text-transform` values.
+ * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera.
+ * Correct `select` style inheritance in Firefox.
+ */
+button,
+select {
+ text-transform: none; }
+
+/**
+ * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
+ * and `video` controls.
+ * 2. Correct inability to style clickable `input` types in iOS.
+ * 3. Improve usability and consistency of cursor style between image-type
+ * `input` and others.
+ */
+button,
+html input[type="button"],
+input[type="reset"],
+input[type="submit"] {
+ -webkit-appearance: button;
+ /* 2 */
+ cursor: pointer;
+ /* 3 */ }
+
+/**
+ * Re-set default cursor for disabled elements.
+ */
+button[disabled],
+html input[disabled] {
+ cursor: not-allowed; }
+
+/**
+ * Remove inner padding and border in Firefox 4+.
+ */
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+ border: 0;
+ padding: 0; }
+
+/**
+ * Address Firefox 4+ setting `line-height` on `input` using `!important` in
+ * the UA stylesheet.
+ */
+input {
+ line-height: normal; }
+
+/**
+ * It's recommended that you don't attempt to style these elements.
+ * Firefox's implementation doesn't respect box-sizing, padding, or width.
+ *
+ * 1. Address box sizing set to `content-box` in IE 8/9/10.
+ * 2. Remove excess padding in IE 8/9/10.
+ */
+input[type="checkbox"],
+input[type="radio"] {
+ box-sizing: border-box;
+ /* 1 */
+ padding: 0;
+ /* 2 */ }
+
+/**
+ * Fix the cursor style for Chrome's increment/decrement buttons. For certain
+ * `font-size` values of the `input`, it causes the cursor style of the
+ * decrement button to change from `default` to `text`.
+ */
+input[type="number"]::-webkit-inner-spin-button,
+input[type="number"]::-webkit-outer-spin-button {
+ height: auto; }
+
+/**
+ * 1. Address `appearance` set to `searchfield` in Safari and Chrome.
+ * 2. Address `box-sizing` set to `border-box` in Safari and Chrome.
+ */
+input[type="search"] {
+ -webkit-appearance: textfield;
+ /* 1 */
+ box-sizing: content-box;
+ /* 2 */ }
+
+/**
+ * Remove inner padding and search cancel button in Safari and Chrome on OS X.
+ * Safari (but not Chrome) clips the cancel button when the search input has
+ * padding (and `textfield` appearance).
+ */
+input[type="search"]::-webkit-search-cancel-button,
+input[type="search"]::-webkit-search-decoration {
+ -webkit-appearance: none; }
+
+/**
+ * Define consistent border, margin, and padding.
+ * [NOTE] We don't enable this ruleset in Foundation, because we want the