From 079f528fa472bcddf3666e706684f02208f87807 Mon Sep 17 00:00:00 2001 From: Steffany Brown Date: Sun, 6 May 2018 13:10:27 -0700 Subject: [PATCH 01/12] recreated my other project that I deleted in an attempt to fix my error, to no avail --- .gitignore | 28 + .ruby-version | 1 + Gemfile | 85 ++ Gemfile.lock | 286 ++++++ Rakefile | 6 + app/assets/config/manifest.js | 3 + app/assets/images/.keep | 0 app/assets/javascripts/application.js | 21 + app/assets/javascripts/cable.js | 13 + app/assets/javascripts/channels/.keep | 0 app/assets/javascripts/recipe.js | 2 + app/assets/stylesheets/_settings.scss | 869 ++++++++++++++++++ app/assets/stylesheets/application.css | 19 + app/assets/stylesheets/browserslist | 4 + .../stylesheets/foundation_and_overrides.scss | 61 ++ app/assets/stylesheets/recipe.scss | 3 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/controllers/recipe_controller.rb | 33 + app/helpers/application_helper.rb | 2 + app/helpers/recipe_helper.rb | 2 + app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/application.html.erb | 19 + app/views/layouts/mailer.html.erb | 13 + app/views/layouts/mailer.text.erb | 1 + app/views/recipe/create.html.erb | 2 + app/views/recipe/destroy.html.erb | 2 + app/views/recipe/edit.html.erb | 2 + app/views/recipe/index.html.erb | 13 + app/views/recipe/new.html.erb | 8 + app/views/recipe/show.html.erb | 32 + app/views/recipe/update.html.erb | 2 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 36 + bin/spring | 17 + bin/update | 31 + bin/yarn | 11 + config.ru | 5 + config/application.rb | 28 + config/boot.rb | 4 + config/cable.yml | 10 + config/credentials.yml.enc | 1 + config/database.yml | 85 ++ config/environment.rb | 5 + config/environments/development.rb | 61 ++ config/environments/production.rb | 94 ++ config/environments/test.rb | 46 + .../application_controller_renderer.rb | 8 + config/initializers/assets.rb | 14 + config/initializers/backtrace_silencers.rb | 7 + .../initializers/content_security_policy.rb | 25 + config/initializers/cookies_serializer.rb | 5 + .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 + config/initializers/mime_types.rb | 4 + .../initializers/will_paginate_array_fix.rb | 1 + config/initializers/wrap_parameters.rb | 14 + config/locales/en.yml | 33 + config/puma.rb | 34 + config/routes.rb | 5 + config/spring.rb | 6 + config/storage.yml | 34 + db/schema.rb | 18 + db/seeds.rb | 7 + lib/assets/.keep | 0 lib/edamam_api_wrapper.rb | 46 + lib/recipe.rb | 14 + lib/tasks/.keep | 0 log/.keep | 0 package.json | 5 + public/404.html | 67 ++ public/422.html | 67 ++ public/500.html | 66 ++ public/apple-touch-icon-precomposed.png | 0 public/apple-touch-icon.png | 0 public/favicon.ico | 0 public/robots.txt | 1 + test/application_system_test_case.rb | 5 + test/controllers/.keep | 0 test/controllers/recipe_controller_test.rb | 39 + test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/helpers/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/system/.keep | 0 test/test_helper.rb | 26 + tmp/.keep | 0 vendor/.keep | 0 97 files changed, 2577 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Rakefile create mode 100644 app/assets/config/manifest.js create mode 100644 app/assets/images/.keep create mode 100644 app/assets/javascripts/application.js create mode 100644 app/assets/javascripts/cable.js create mode 100644 app/assets/javascripts/channels/.keep create mode 100644 app/assets/javascripts/recipe.js create mode 100644 app/assets/stylesheets/_settings.scss create mode 100644 app/assets/stylesheets/application.css create mode 100644 app/assets/stylesheets/browserslist create mode 100644 app/assets/stylesheets/foundation_and_overrides.scss create mode 100644 app/assets/stylesheets/recipe.scss create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/controllers/recipe_controller.rb create mode 100644 app/helpers/application_helper.rb create mode 100644 app/helpers/recipe_helper.rb create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/application.html.erb create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100644 app/views/recipe/create.html.erb create mode 100644 app/views/recipe/destroy.html.erb create mode 100644 app/views/recipe/edit.html.erb create mode 100644 app/views/recipe/index.html.erb create mode 100644 app/views/recipe/new.html.erb create mode 100644 app/views/recipe/show.html.erb create mode 100644 app/views/recipe/update.html.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100755 bin/update create mode 100755 bin/yarn create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/assets.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/content_security_policy.rb create mode 100644 config/initializers/cookies_serializer.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/will_paginate_array_fix.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 db/schema.rb create mode 100644 db/seeds.rb create mode 100644 lib/assets/.keep create mode 100644 lib/edamam_api_wrapper.rb create mode 100644 lib/recipe.rb create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 package.json create mode 100644 public/404.html create mode 100644 public/422.html create mode 100644 public/500.html create mode 100644 public/apple-touch-icon-precomposed.png create mode 100644 public/apple-touch-icon.png create mode 100644 public/favicon.ico create mode 100644 public/robots.txt create mode 100644 test/application_system_test_case.rb create mode 100644 test/controllers/.keep create mode 100644 test/controllers/recipe_controller_test.rb create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/helpers/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/system/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..d4771dbbd --- /dev/null +++ b/.gitignore @@ -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 diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..fad066f80 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.5.0 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..0a4142078 --- /dev/null +++ b/Gemfile @@ -0,0 +1,85 @@ +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] + 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', '< 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' +end + +group :development do + gem 'better_errors' + gem 'binding_of_caller' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..31f627961 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,286 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.0) + actionpack (= 5.2.0) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.0) + actionpack (= 5.2.0) + actionview (= 5.2.0) + activejob (= 5.2.0) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.0) + actionview (= 5.2.0) + activesupport (= 5.2.0) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.0) + activesupport (= 5.2.0) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.0) + activesupport (= 5.2.0) + globalid (>= 0.3.6) + activemodel (5.2.0) + activesupport (= 5.2.0) + activerecord (5.2.0) + activemodel (= 5.2.0) + activesupport (= 5.2.0) + arel (>= 9.0) + activestorage (5.2.0) + actionpack (= 5.2.0) + activerecord (= 5.2.0) + marcel (~> 0.3.1) + activesupport (5.2.0) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + ansi (1.5.0) + archive-zip (0.11.0) + io-like (~> 0.3.0) + arel (9.0.0) + babel-source (5.8.35) + babel-transpiler (0.7.0) + babel-source (>= 4.0, < 6) + execjs (~> 2.0) + better_errors (2.4.0) + coderay (>= 1.0.0) + erubi (>= 1.0.0) + rack (>= 0.9.0) + bindex (0.5.0) + binding_of_caller (0.8.0) + debug_inspector (>= 0.0.1) + bootsnap (1.3.0) + msgpack (~> 1.0) + builder (3.2.3) + byebug (10.0.2) + capybara (3.0.3) + addressable + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + xpath (~> 3.0) + childprocess (0.9.0) + ffi (~> 1.0, >= 1.0.11) + chromedriver-helper (1.2.0) + archive-zip (~> 0.10) + nokogiri (~> 1.8) + coderay (1.1.2) + concurrent-ruby (1.0.5) + crack (0.4.3) + safe_yaml (~> 1.0.0) + crass (1.0.4) + debug_inspector (0.0.3) + dotenv (2.4.0) + dotenv-rails (2.4.0) + dotenv (= 2.4.0) + railties (>= 3.2, < 6.0) + erubi (1.7.1) + execjs (2.7.0) + ffi (1.9.23) + foundation-rails (6.4.3.0) + railties (>= 3.1.0) + sass (>= 3.3.0, < 3.5) + sprockets-es6 (>= 0.9.0) + globalid (0.4.1) + activesupport (>= 4.2.0) + hashdiff (0.3.7) + httparty (0.16.2) + multi_xml (>= 0.5.2) + i18n (1.0.1) + concurrent-ruby (~> 1.0) + io-like (0.3.0) + jbuilder (2.7.0) + activesupport (>= 4.2.0) + multi_json (>= 1.2) + jquery-rails (4.3.3) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + jquery-turbolinks (2.1.0) + railties (>= 3.1.0) + turbolinks + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.2.2) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.0) + mini_mime (>= 0.1.1) + marcel (0.3.2) + mimemagic (~> 0.3.2) + method_source (0.9.0) + mimemagic (0.3.2) + mini_mime (1.0.0) + mini_portile2 (2.3.0) + minispec-metadata (2.0.0) + minitest + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.2.0) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + minitest-vcr (1.4.0) + minispec-metadata (~> 2.0) + minitest (>= 4.7.5) + vcr (>= 2.9) + msgpack (1.2.4) + multi_json (1.13.1) + multi_xml (0.6.0) + nio4r (2.3.1) + nokogiri (1.8.2) + mini_portile2 (~> 2.3.0) + normalize-rails (4.1.1) + pg (1.0.0) + pry (0.11.3) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.6) + pry (>= 0.10.4) + public_suffix (3.0.2) + puma (3.11.4) + rack (2.0.5) + rack-test (1.0.0) + rack (>= 1.0, < 3) + rails (5.2.0) + actioncable (= 5.2.0) + actionmailer (= 5.2.0) + actionpack (= 5.2.0) + actionview (= 5.2.0) + activejob (= 5.2.0) + activemodel (= 5.2.0) + activerecord (= 5.2.0) + activestorage (= 5.2.0) + activesupport (= 5.2.0) + bundler (>= 1.3.0) + railties (= 5.2.0) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.0) + actionpack (= 5.2.0) + activesupport (= 5.2.0) + method_source + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (12.3.1) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + ruby-progressbar (1.9.0) + ruby_dep (1.5.0) + rubyzip (1.2.1) + safe_yaml (1.0.4) + sass (3.4.25) + sass-rails (5.0.7) + railties (>= 4.0.0, < 6) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + selenium-webdriver (3.11.0) + childprocess (~> 0.5) + rubyzip (~> 1.2) + spring (2.0.2) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.1) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-es6 (0.9.2) + babel-source (>= 5.8.11) + babel-transpiler + sprockets (>= 3.0.0) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.0) + thread_safe (0.3.6) + tilt (2.0.8) + turbolinks (5.1.1) + turbolinks-source (~> 5.1) + turbolinks-source (5.1.0) + tzinfo (1.2.5) + thread_safe (~> 0.1) + uglifier (4.1.10) + execjs (>= 0.3.0, < 3) + vcr (4.0.0) + web-console (3.6.2) + actionview (>= 5.0) + activemodel (>= 5.0) + bindex (>= 0.4.0) + railties (>= 5.0) + webmock (3.4.1) + addressable (>= 2.3.6) + crack (>= 0.3.2) + hashdiff + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + will_paginate (3.1.6) + xpath (3.0.0) + nokogiri (~> 1.8) + +PLATFORMS + ruby + +DEPENDENCIES + better_errors + binding_of_caller + bootsnap (>= 1.1.0) + byebug + capybara (>= 2.15, < 4.0) + chromedriver-helper + dotenv-rails + foundation-rails + httparty + jbuilder (~> 2.5) + jquery-rails + jquery-turbolinks + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + minitest-vcr + normalize-rails + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.0) + sass-rails (~> 5.0) + selenium-webdriver + spring + spring-watcher-listen (~> 2.0.0) + turbolinks (~> 5) + tzinfo-data + uglifier (>= 1.3.0) + web-console (>= 3.3.0) + webmock + will_paginate + +RUBY VERSION + ruby 2.5.0p0 + +BUNDLED WITH + 1.16.1 diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js new file mode 100644 index 000000000..b16e53d6d --- /dev/null +++ b/app/assets/config/manifest.js @@ -0,0 +1,3 @@ +//= link_tree ../images +//= link_directory ../javascripts .js +//= link_directory ../stylesheets .css diff --git a/app/assets/images/.keep b/app/assets/images/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js new file mode 100644 index 000000000..183604ee9 --- /dev/null +++ b/app/assets/javascripts/application.js @@ -0,0 +1,21 @@ +// This is a manifest file that'll be compiled into application.js, which will include all the files +// listed below. +// +// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, or any plugin's +// vendor/assets/javascripts directory can be referenced here using a relative path. +// +// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the +// compiled file. JavaScript code in this file should be added after the last require_* statement. +// +// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details +// about supported directives. +//= require jquery + +// +//= require rails-ujs +//= require foundation +//= require activestorage +//= require turbolinks +//= require_tree . + +$(function(){ $(document).foundation(); }); diff --git a/app/assets/javascripts/cable.js b/app/assets/javascripts/cable.js new file mode 100644 index 000000000..739aa5f02 --- /dev/null +++ b/app/assets/javascripts/cable.js @@ -0,0 +1,13 @@ +// Action Cable provides the framework to deal with WebSockets in Rails. +// You can generate new channels where WebSocket features live using the `rails generate channel` command. +// +//= require action_cable +//= require_self +//= require_tree ./channels + +(function() { + this.App || (this.App = {}); + + App.cable = ActionCable.createConsumer(); + +}).call(this); diff --git a/app/assets/javascripts/channels/.keep b/app/assets/javascripts/channels/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/assets/javascripts/recipe.js b/app/assets/javascripts/recipe.js new file mode 100644 index 000000000..dee720fac --- /dev/null +++ b/app/assets/javascripts/recipe.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/stylesheets/_settings.scss b/app/assets/stylesheets/_settings.scss new file mode 100644 index 000000000..26f74f949 --- /dev/null +++ b/app/assets/stylesheets/_settings.scss @@ -0,0 +1,869 @@ +// Foundation for Sites Settings +// ----------------------------- +// +// Table of Contents: +// +// 1. Global +// 2. Breakpoints +// 3. The Grid +// 4. Base Typography +// 5. Typography Helpers +// 6. Abide +// 7. Accordion +// 8. Accordion Menu +// 9. Badge +// 10. Breadcrumbs +// 11. Button +// 12. Button Group +// 13. Callout +// 14. Card +// 15. Close Button +// 16. Drilldown +// 17. Dropdown +// 18. Dropdown Menu +// 19. Flexbox Utilities +// 20. Forms +// 21. Label +// 22. Media Object +// 23. Menu +// 24. Meter +// 25. Off-canvas +// 26. Orbit +// 27. Pagination +// 28. Progress Bar +// 29. Prototype Arrow +// 30. Prototype Border-Box +// 31. Prototype Border-None +// 32. Prototype Bordered +// 33. Prototype Display +// 34. Prototype Font-Styling +// 35. Prototype List-Style-Type +// 36. Prototype Overflow +// 37. Prototype Position +// 38. Prototype Rounded +// 39. Prototype Separator +// 40. Prototype Shadow +// 41. Prototype Sizing +// 42. Prototype Spacing +// 43. Prototype Text-Decoration +// 44. Prototype Text-Transformation +// 45. Prototype Text-Utilities +// 46. Responsive Embed +// 47. Reveal +// 48. Slider +// 49. Switch +// 50. Table +// 51. Tabs +// 52. Thumbnail +// 53. Title Bar +// 54. Tooltip +// 55. Top Bar +// 56. Xy Grid + +@import 'util/util'; + +// 1. Global +// --------- + +$global-font-size: 100%; +$global-width: rem-calc(1200); +$global-lineheight: 1.5; +$foundation-palette: ( + primary: #1779ba, + secondary: #767676, + success: #3adb76, + warning: #ffae00, + alert: #cc4b37, +); +$light-gray: #e6e6e6; +$medium-gray: #cacaca; +$dark-gray: #8a8a8a; +$black: #0a0a0a; +$white: #fefefe; +$body-background: $white; +$body-font-color: $black; +$body-font-family: 'Helvetica Neue', Helvetica, Roboto, Arial, sans-serif; +$body-antialiased: true; +$global-margin: 1rem; +$global-padding: 1rem; +$global-position: 1rem; +$global-weight-normal: normal; +$global-weight-bold: bold; +$global-radius: 0; +$global-menu-padding: 0.7rem 1rem; +$global-menu-nested-margin: 1rem; +$global-text-direction: ltr; +$global-flexbox: true; +$global-prototype-breakpoints: false; +$global-button-cursor: auto; +$global-color-pick-contrast-tolerance: 0; +$print-transparent-backgrounds: true; + +@include add-foundation-colors; + +// 2. Breakpoints +// -------------- + +$breakpoints: ( + small: 0, + medium: 640px, + large: 1024px, + xlarge: 1200px, + xxlarge: 1440px, +); +$print-breakpoint: large; +$breakpoint-classes: (small medium large); + +// 3. The Grid +// ----------- + +$grid-row-width: $global-width; +$grid-column-count: 12; +$grid-column-gutter: ( + small: 20px, + medium: 30px, +); +$grid-column-align-edge: true; +$grid-column-alias: 'columns'; +$block-grid-max: 8; + +// 4. Base Typography +// ------------------ + +$header-font-family: $body-font-family; +$header-font-weight: $global-weight-normal; +$header-font-style: normal; +$font-family-monospace: Consolas, 'Liberation Mono', Courier, monospace; +$header-color: inherit; +$header-lineheight: 1.4; +$header-margin-bottom: 0.5rem; +$header-styles: ( + small: ( + 'h1': ('font-size': 24), + 'h2': ('font-size': 20), + 'h3': ('font-size': 19), + 'h4': ('font-size': 18), + 'h5': ('font-size': 17), + 'h6': ('font-size': 16), + ), + medium: ( + 'h1': ('font-size': 48), + 'h2': ('font-size': 40), + 'h3': ('font-size': 31), + 'h4': ('font-size': 25), + 'h5': ('font-size': 20), + 'h6': ('font-size': 16), + ), +); +$header-text-rendering: optimizeLegibility; +$small-font-size: 80%; +$header-small-font-color: $medium-gray; +$paragraph-lineheight: 1.6; +$paragraph-margin-bottom: 1rem; +$paragraph-text-rendering: optimizeLegibility; +$code-color: $black; +$code-font-family: $font-family-monospace; +$code-font-weight: $global-weight-normal; +$code-background: $light-gray; +$code-border: 1px solid $medium-gray; +$code-padding: rem-calc(2 5 1); +$anchor-color: $primary-color; +$anchor-color-hover: scale-color($anchor-color, $lightness: -14%); +$anchor-text-decoration: none; +$anchor-text-decoration-hover: none; +$hr-width: $global-width; +$hr-border: 1px solid $medium-gray; +$hr-margin: rem-calc(20) auto; +$list-lineheight: $paragraph-lineheight; +$list-margin-bottom: $paragraph-margin-bottom; +$list-style-type: disc; +$list-style-position: outside; +$list-side-margin: 1.25rem; +$list-nested-side-margin: 1.25rem; +$defnlist-margin-bottom: 1rem; +$defnlist-term-weight: $global-weight-bold; +$defnlist-term-margin-bottom: 0.3rem; +$blockquote-color: $dark-gray; +$blockquote-padding: rem-calc(9 20 0 19); +$blockquote-border: 1px solid $medium-gray; +$cite-font-size: rem-calc(13); +$cite-color: $dark-gray; +$cite-pseudo-content: '\2014 \0020'; +$keystroke-font: $font-family-monospace; +$keystroke-color: $black; +$keystroke-background: $light-gray; +$keystroke-padding: rem-calc(2 4 0); +$keystroke-radius: $global-radius; +$abbr-underline: 1px dotted $black; + +// 5. Typography Helpers +// --------------------- + +$lead-font-size: $global-font-size * 1.25; +$lead-lineheight: 1.6; +$subheader-lineheight: 1.4; +$subheader-color: $dark-gray; +$subheader-font-weight: $global-weight-normal; +$subheader-margin-top: 0.2rem; +$subheader-margin-bottom: 0.5rem; +$stat-font-size: 2.5rem; + +// 6. Abide +// -------- + +$abide-inputs: true; +$abide-labels: true; +$input-background-invalid: get-color(alert); +$form-label-color-invalid: get-color(alert); +$input-error-color: get-color(alert); +$input-error-font-size: rem-calc(12); +$input-error-font-weight: $global-weight-bold; + +// 7. Accordion +// ------------ + +$accordion-background: $white; +$accordion-plusminus: true; +$accordion-title-font-size: rem-calc(12); +$accordion-item-color: $primary-color; +$accordion-item-background-hover: $light-gray; +$accordion-item-padding: 1.25rem 1rem; +$accordion-content-background: $white; +$accordion-content-border: 1px solid $light-gray; +$accordion-content-color: $body-font-color; +$accordion-content-padding: 1rem; + +// 8. Accordion Menu +// ----------------- + +$accordionmenu-padding: $global-menu-padding; +$accordionmenu-nested-margin: $global-menu-nested-margin; +$accordionmenu-submenu-padding: $accordionmenu-padding; +$accordionmenu-arrows: true; +$accordionmenu-arrow-color: $primary-color; +$accordionmenu-item-background: null; +$accordionmenu-border: null; +$accordionmenu-submenu-toggle-background: null; +$accordion-submenu-toggle-border: $accordionmenu-border; +$accordionmenu-submenu-toggle-width: 40px; +$accordionmenu-submenu-toggle-height: $accordionmenu-submenu-toggle-width; +$accordionmenu-arrow-size: 6px; + +// 9. Badge +// -------- + +$badge-background: $primary-color; +$badge-color: $white; +$badge-color-alt: $black; +$badge-palette: $foundation-palette; +$badge-padding: 0.3em; +$badge-minwidth: 2.1em; +$badge-font-size: 0.6rem; + +// 10. Breadcrumbs +// --------------- + +$breadcrumbs-margin: 0 0 $global-margin 0; +$breadcrumbs-item-font-size: rem-calc(11); +$breadcrumbs-item-color: $primary-color; +$breadcrumbs-item-color-current: $black; +$breadcrumbs-item-color-disabled: $medium-gray; +$breadcrumbs-item-margin: 0.75rem; +$breadcrumbs-item-uppercase: true; +$breadcrumbs-item-separator: true; +$breadcrumbs-item-separator-item: '/'; +$breadcrumbs-item-separator-item-rtl: '\\'; +$breadcrumbs-item-separator-color: $medium-gray; + +// 11. Button +// ---------- + +$button-font-family: inherit; +$button-padding: 0.85em 1em; +$button-margin: 0 0 $global-margin 0; +$button-fill: solid; +$button-background: $primary-color; +$button-background-hover: scale-color($button-background, $lightness: -15%); +$button-color: $white; +$button-color-alt: $black; +$button-radius: $global-radius; +$button-hollow-border-width: 1px; +$button-sizes: ( + tiny: 0.6rem, + small: 0.75rem, + default: 0.9rem, + large: 1.25rem, +); +$button-palette: $foundation-palette; +$button-opacity-disabled: 0.25; +$button-background-hover-lightness: -20%; +$button-hollow-hover-lightness: -50%; +$button-transition: background-color 0.25s ease-out, color 0.25s ease-out; + +// 12. Button Group +// ---------------- + +$buttongroup-margin: 1rem; +$buttongroup-spacing: 1px; +$buttongroup-child-selector: '.button'; +$buttongroup-expand-max: 6; +$buttongroup-radius-on-each: true; + +// 13. Callout +// ----------- + +$callout-background: $white; +$callout-background-fade: 85%; +$callout-border: 1px solid rgba($black, 0.25); +$callout-margin: 0 0 1rem 0; +$callout-padding: 1rem; +$callout-font-color: $body-font-color; +$callout-font-color-alt: $body-background; +$callout-radius: $global-radius; +$callout-link-tint: 30%; + +// 14. Card +// -------- + +$card-background: $white; +$card-font-color: $body-font-color; +$card-divider-background: $light-gray; +$card-border: 1px solid $light-gray; +$card-shadow: none; +$card-border-radius: $global-radius; +$card-padding: $global-padding; +$card-margin-bottom: $global-margin; + +// 15. Close Button +// ---------------- + +$closebutton-position: right top; +$closebutton-offset-horizontal: ( + small: 0.66rem, + medium: 1rem, +); +$closebutton-offset-vertical: ( + small: 0.33em, + medium: 0.5rem, +); +$closebutton-size: ( + small: 1.5em, + medium: 2em, +); +$closebutton-lineheight: 1; +$closebutton-color: $dark-gray; +$closebutton-color-hover: $black; + +// 16. Drilldown +// ------------- + +$drilldown-transition: transform 0.15s linear; +$drilldown-arrows: true; +$drilldown-padding: $global-menu-padding; +$drilldown-nested-margin: 0; +$drilldown-background: $white; +$drilldown-submenu-padding: $drilldown-padding; +$drilldown-submenu-background: $white; +$drilldown-arrow-color: $primary-color; +$drilldown-arrow-size: 6px; + +// 17. Dropdown +// ------------ + +$dropdown-padding: 1rem; +$dropdown-background: $body-background; +$dropdown-border: 1px solid $medium-gray; +$dropdown-font-size: 1rem; +$dropdown-width: 300px; +$dropdown-radius: $global-radius; +$dropdown-sizes: ( + tiny: 100px, + small: 200px, + large: 400px, +); + +// 18. Dropdown Menu +// ----------------- + +$dropdownmenu-arrows: true; +$dropdownmenu-arrow-color: $anchor-color; +$dropdownmenu-arrow-size: 6px; +$dropdownmenu-arrow-padding: 1.5rem; +$dropdownmenu-min-width: 200px; +$dropdownmenu-background: $white; +$dropdownmenu-submenu-background: $dropdownmenu-background; +$dropdownmenu-padding: $global-menu-padding; +$dropdownmenu-nested-margin: 0; +$dropdownmenu-submenu-padding: $dropdownmenu-padding; +$dropdownmenu-border: 1px solid $medium-gray; +$dropdown-menu-item-color-active: get-color(primary); +$dropdown-menu-item-background-active: transparent; + +// 19. Flexbox Utilities +// --------------------- + +$flex-source-ordering-count: 6; +$flexbox-responsive-breakpoints: true; + +// 20. Forms +// --------- + +$fieldset-border: 1px solid $medium-gray; +$fieldset-padding: rem-calc(20); +$fieldset-margin: rem-calc(18 0); +$legend-padding: rem-calc(0 3); +$form-spacing: rem-calc(16); +$helptext-color: $black; +$helptext-font-size: rem-calc(13); +$helptext-font-style: italic; +$input-prefix-color: $black; +$input-prefix-background: $light-gray; +$input-prefix-border: 1px solid $medium-gray; +$input-prefix-padding: 1rem; +$form-label-color: $black; +$form-label-font-size: rem-calc(14); +$form-label-font-weight: $global-weight-normal; +$form-label-line-height: 1.8; +$select-background: $white; +$select-triangle-color: $dark-gray; +$select-radius: $global-radius; +$input-color: $black; +$input-placeholder-color: $medium-gray; +$input-font-family: inherit; +$input-font-size: rem-calc(16); +$input-font-weight: $global-weight-normal; +$input-line-height: $global-lineheight; +$input-background: $white; +$input-background-focus: $white; +$input-background-disabled: $light-gray; +$input-border: 1px solid $medium-gray; +$input-border-focus: 1px solid $dark-gray; +$input-padding: $form-spacing / 2; +$input-shadow: inset 0 1px 2px rgba($black, 0.1); +$input-shadow-focus: 0 0 5px $medium-gray; +$input-cursor-disabled: not-allowed; +$input-transition: box-shadow 0.5s, border-color 0.25s ease-in-out; +$input-number-spinners: true; +$input-radius: $global-radius; +$form-button-radius: $global-radius; + +// 21. Label +// --------- + +$label-background: $primary-color; +$label-color: $white; +$label-color-alt: $black; +$label-palette: $foundation-palette; +$label-font-size: 0.8rem; +$label-padding: 0.33333rem 0.5rem; +$label-radius: $global-radius; + +// 22. Media Object +// ---------------- + +$mediaobject-margin-bottom: $global-margin; +$mediaobject-section-padding: $global-padding; +$mediaobject-image-width-stacked: 100%; + +// 23. Menu +// -------- + +$menu-margin: 0; +$menu-nested-margin: $global-menu-nested-margin; +$menu-items-padding: $global-menu-padding; +$menu-simple-margin: 1rem; +$menu-item-color-active: $white; +$menu-item-background-active: get-color(primary); +$menu-icon-spacing: 0.25rem; +$menu-item-background-hover: $light-gray; +$menu-state-back-compat: true; +$menu-centered-back-compat: true; +$menu-icons-back-compat: true; + +// 24. Meter +// --------- + +$meter-height: 1rem; +$meter-radius: $global-radius; +$meter-background: $medium-gray; +$meter-fill-good: $success-color; +$meter-fill-medium: $warning-color; +$meter-fill-bad: $alert-color; + +// 25. Off-canvas +// -------------- + +$offcanvas-sizes: ( + small: 250px, +); +$offcanvas-vertical-sizes: ( + small: 250px, +); +$offcanvas-background: $light-gray; +$offcanvas-shadow: 0 0 10px rgba($black, 0.7); +$offcanvas-inner-shadow-size: 20px; +$offcanvas-inner-shadow-color: rgba($black, 0.25); +$offcanvas-overlay-zindex: 11; +$offcanvas-push-zindex: 12; +$offcanvas-overlap-zindex: 13; +$offcanvas-reveal-zindex: 12; +$offcanvas-transition-length: 0.5s; +$offcanvas-transition-timing: ease; +$offcanvas-fixed-reveal: true; +$offcanvas-exit-background: rgba($white, 0.25); +$maincontent-class: 'off-canvas-content'; + +// 26. Orbit +// --------- + +$orbit-bullet-background: $medium-gray; +$orbit-bullet-background-active: $dark-gray; +$orbit-bullet-diameter: 1.2rem; +$orbit-bullet-margin: 0.1rem; +$orbit-bullet-margin-top: 0.8rem; +$orbit-bullet-margin-bottom: 0.8rem; +$orbit-caption-background: rgba($black, 0.5); +$orbit-caption-padding: 1rem; +$orbit-control-background-hover: rgba($black, 0.5); +$orbit-control-padding: 1rem; +$orbit-control-zindex: 10; + +// 27. Pagination +// -------------- + +$pagination-font-size: rem-calc(14); +$pagination-margin-bottom: $global-margin; +$pagination-item-color: $black; +$pagination-item-padding: rem-calc(3 10); +$pagination-item-spacing: rem-calc(1); +$pagination-radius: $global-radius; +$pagination-item-background-hover: $light-gray; +$pagination-item-background-current: $primary-color; +$pagination-item-color-current: $white; +$pagination-item-color-disabled: $medium-gray; +$pagination-ellipsis-color: $black; +$pagination-mobile-items: false; +$pagination-mobile-current-item: false; +$pagination-arrows: true; + +// 28. Progress Bar +// ---------------- + +$progress-height: 1rem; +$progress-background: $medium-gray; +$progress-margin-bottom: $global-margin; +$progress-meter-background: $primary-color; +$progress-radius: $global-radius; + +// 29. Prototype Arrow +// ------------------- + +$prototype-arrow-directions: ( + down, + up, + right, + left +); +$prototype-arrow-size: 0.4375rem; +$prototype-arrow-color: $black; + +// 30. Prototype Border-Box +// ------------------------ + +$prototype-border-box-breakpoints: $global-prototype-breakpoints; + +// 31. Prototype Border-None +// ------------------------- + +$prototype-border-none-breakpoints: $global-prototype-breakpoints; + +// 32. Prototype Bordered +// ---------------------- + +$prototype-bordered-breakpoints: $global-prototype-breakpoints; +$prototype-border-width: rem-calc(1); +$prototype-border-type: solid; +$prototype-border-color: $medium-gray; + +// 33. Prototype Display +// --------------------- + +$prototype-display-breakpoints: $global-prototype-breakpoints; +$prototype-display: ( + inline, + inline-block, + block, + table, + table-cell +); + +// 34. Prototype Font-Styling +// -------------------------- + +$prototype-font-breakpoints: $global-prototype-breakpoints; +$prototype-wide-letter-spacing: rem-calc(4); +$prototype-font-normal: $global-weight-normal; +$prototype-font-bold: $global-weight-bold; + +// 35. Prototype List-Style-Type +// ----------------------------- + +$prototype-list-breakpoints: $global-prototype-breakpoints; +$prototype-style-type-unordered: ( + disc, + circle, + square +); +$prototype-style-type-ordered: ( + decimal, + lower-alpha, + lower-latin, + lower-roman, + upper-alpha, + upper-latin, + upper-roman +); + +// 36. Prototype Overflow +// ---------------------- + +$prototype-overflow-breakpoints: $global-prototype-breakpoints; +$prototype-overflow: ( + visible, + hidden, + scroll +); + +// 37. Prototype Position +// ---------------------- + +$prototype-position-breakpoints: $global-prototype-breakpoints; +$prototype-position: ( + static, + relative, + absolute, + fixed +); +$prototype-position-z-index: 975; + +// 38. Prototype Rounded +// --------------------- + +$prototype-rounded-breakpoints: $global-prototype-breakpoints; +$prototype-border-radius: rem-calc(3); + +// 39. Prototype Separator +// ----------------------- + +$prototype-separator-breakpoints: $global-prototype-breakpoints; +$prototype-separator-align: center; +$prototype-separator-height: rem-calc(2); +$prototype-separator-width: 3rem; +$prototype-separator-background: $primary-color; +$prototype-separator-margin-top: $global-margin; + +// 40. Prototype Shadow +// -------------------- + +$prototype-shadow-breakpoints: $global-prototype-breakpoints; +$prototype-box-shadow: 0 2px 5px 0 rgba(0,0,0,.16), + 0 2px 10px 0 rgba(0,0,0,.12); + +// 41. Prototype Sizing +// -------------------- + +$prototype-sizing-breakpoints: $global-prototype-breakpoints; +$prototype-sizing: ( + width, + height +); +$prototype-sizes: ( + 25: 25%, + 50: 50%, + 75: 75%, + 100: 100% +); + +// 42. Prototype Spacing +// --------------------- + +$prototype-spacing-breakpoints: $global-prototype-breakpoints; +$prototype-spacers-count: 3; + +// 43. Prototype Text-Decoration +// ----------------------------- + +$prototype-decoration-breakpoints: $global-prototype-breakpoints; +$prototype-text-decoration: ( + overline, + underline, + line-through, +); + +// 44. Prototype Text-Transformation +// --------------------------------- + +$prototype-transformation-breakpoints: $global-prototype-breakpoints; +$prototype-text-transformation: ( + lowercase, + uppercase, + capitalize +); + +// 45. Prototype Text-Utilities +// ---------------------------- + +$prototype-utilities-breakpoints: $global-prototype-breakpoints; +$prototype-text-overflow: ellipsis; + +// 46. Responsive Embed +// -------------------- + +$responsive-embed-margin-bottom: rem-calc(16); +$responsive-embed-ratios: ( + default: 4 by 3, + widescreen: 16 by 9, +); + +// 47. Reveal +// ---------- + +$reveal-background: $white; +$reveal-width: 600px; +$reveal-max-width: $global-width; +$reveal-padding: $global-padding; +$reveal-border: 1px solid $medium-gray; +$reveal-radius: $global-radius; +$reveal-zindex: 1005; +$reveal-overlay-background: rgba($black, 0.45); + +// 48. Slider +// ---------- + +$slider-width-vertical: 0.5rem; +$slider-transition: all 0.2s ease-in-out; +$slider-height: 0.5rem; +$slider-background: $light-gray; +$slider-fill-background: $medium-gray; +$slider-handle-height: 1.4rem; +$slider-handle-width: 1.4rem; +$slider-handle-background: $primary-color; +$slider-opacity-disabled: 0.25; +$slider-radius: $global-radius; + +// 49. Switch +// ---------- + +$switch-background: $medium-gray; +$switch-background-active: $primary-color; +$switch-height: 2rem; +$switch-height-tiny: 1.5rem; +$switch-height-small: 1.75rem; +$switch-height-large: 2.5rem; +$switch-radius: $global-radius; +$switch-margin: $global-margin; +$switch-paddle-background: $white; +$switch-paddle-offset: 0.25rem; +$switch-paddle-radius: $global-radius; +$switch-paddle-transition: all 0.25s ease-out; + +// 50. Table +// --------- + +$table-background: $white; +$table-color-scale: 5%; +$table-border: 1px solid smart-scale($table-background, $table-color-scale); +$table-padding: rem-calc(8 10 10); +$table-hover-scale: 2%; +$table-row-hover: darken($table-background, $table-hover-scale); +$table-row-stripe-hover: darken($table-background, $table-color-scale + $table-hover-scale); +$table-is-striped: true; +$table-striped-background: smart-scale($table-background, $table-color-scale); +$table-stripe: even; +$table-head-background: smart-scale($table-background, $table-color-scale / 2); +$table-head-row-hover: darken($table-head-background, $table-hover-scale); +$table-foot-background: smart-scale($table-background, $table-color-scale); +$table-foot-row-hover: darken($table-foot-background, $table-hover-scale); +$table-head-font-color: $body-font-color; +$table-foot-font-color: $body-font-color; +$show-header-for-stacked: false; +$table-stack-breakpoint: medium; + +// 51. Tabs +// -------- + +$tab-margin: 0; +$tab-background: $white; +$tab-color: $primary-color; +$tab-background-active: $light-gray; +$tab-active-color: $primary-color; +$tab-item-font-size: rem-calc(12); +$tab-item-background-hover: $white; +$tab-item-padding: 1.25rem 1.5rem; +$tab-expand-max: 6; +$tab-content-background: $white; +$tab-content-border: $light-gray; +$tab-content-color: $body-font-color; +$tab-content-padding: 1rem; + +// 52. Thumbnail +// ------------- + +$thumbnail-border: solid 4px $white; +$thumbnail-margin-bottom: $global-margin; +$thumbnail-shadow: 0 0 0 1px rgba($black, 0.2); +$thumbnail-shadow-hover: 0 0 6px 1px rgba($primary-color, 0.5); +$thumbnail-transition: box-shadow 200ms ease-out; +$thumbnail-radius: $global-radius; + +// 53. Title Bar +// ------------- + +$titlebar-background: $black; +$titlebar-color: $white; +$titlebar-padding: 0.5rem; +$titlebar-text-font-weight: bold; +$titlebar-icon-color: $white; +$titlebar-icon-color-hover: $medium-gray; +$titlebar-icon-spacing: 0.25rem; + +// 54. Tooltip +// ----------- + +$has-tip-cursor: help; +$has-tip-font-weight: $global-weight-bold; +$has-tip-border-bottom: dotted 1px $dark-gray; +$tooltip-background-color: $black; +$tooltip-color: $white; +$tooltip-padding: 0.75rem; +$tooltip-max-width: 10rem; +$tooltip-font-size: $small-font-size; +$tooltip-pip-width: 0.75rem; +$tooltip-pip-height: $tooltip-pip-width * 0.866; +$tooltip-radius: $global-radius; + +// 55. Top Bar +// ----------- + +$topbar-padding: 0.5rem; +$topbar-background: $light-gray; +$topbar-submenu-background: $topbar-background; +$topbar-title-spacing: 0.5rem 1rem 0.5rem 0; +$topbar-input-width: 200px; +$topbar-unstack-breakpoint: medium; + +// 56. Xy Grid +// ----------- + +$xy-grid: true; +$grid-container: $global-width; +$grid-columns: 12; +$grid-margin-gutters: ( + small: 20px, + medium: 30px +); +$grid-padding-gutters: $grid-margin-gutters; +$grid-container-padding: $grid-padding-gutters; +$grid-container-max: $global-width; +$xy-block-grid-max: 8; + diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css new file mode 100644 index 000000000..3a3841832 --- /dev/null +++ b/app/assets/stylesheets/application.css @@ -0,0 +1,19 @@ +/* + * 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, 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 other CSS/SCSS + * files in this directory. Styles in this file should be added after the last require_* statement. + * It is generally better to create a new file per style scope. + *= require normalize-rails + + * + *= require_tree . + *= require_self + *= require foundation_and_overrides + + */ diff --git a/app/assets/stylesheets/browserslist b/app/assets/stylesheets/browserslist new file mode 100644 index 000000000..6019618a9 --- /dev/null +++ b/app/assets/stylesheets/browserslist @@ -0,0 +1,4 @@ +last 2 versions +ie >= 9 +Android >= 2.3 +ios >= 7 diff --git a/app/assets/stylesheets/foundation_and_overrides.scss b/app/assets/stylesheets/foundation_and_overrides.scss new file mode 100644 index 000000000..ed4c5a0ec --- /dev/null +++ b/app/assets/stylesheets/foundation_and_overrides.scss @@ -0,0 +1,61 @@ +@charset 'utf-8'; + +@import 'settings'; +@import 'foundation'; + +// If you'd like to include motion-ui the foundation-rails gem comes prepackaged with it, uncomment the 3 @imports, if you are not using the gem you need to install the motion-ui sass package. +// +// @import 'motion-ui/motion-ui'; + +// We include everything by default. To slim your CSS, remove components you don't use. + +@include foundation-global-styles; +@include foundation-xy-grid-classes; +//@include foundation-grid; +//@include foundation-flex-grid; +@include foundation-flex-classes; +@include foundation-typography; +@include foundation-forms; +@include foundation-button; +@include foundation-accordion; +@include foundation-accordion-menu; +@include foundation-badge; +@include foundation-breadcrumbs; +@include foundation-button-group; +@include foundation-callout; +@include foundation-card; +@include foundation-close-button; +@include foundation-menu; +@include foundation-menu-icon; +@include foundation-drilldown-menu; +@include foundation-dropdown; +@include foundation-dropdown-menu; +@include foundation-responsive-embed; +@include foundation-label; +@include foundation-media-object; +@include foundation-off-canvas; +@include foundation-orbit; +@include foundation-pagination; +@include foundation-progress-bar; +@include foundation-slider; +@include foundation-sticky; +@include foundation-reveal; +@include foundation-switch; +@include foundation-table; +@include foundation-tabs; +@include foundation-thumbnail; +@include foundation-title-bar; +@include foundation-tooltip; +@include foundation-top-bar; +@include foundation-visibility-classes; +@include foundation-float-classes; + +// If you'd like to include motion-ui the foundation-rails gem comes prepackaged with it, uncomment the 3 @imports, if you are not using the gem you need to install the motion-ui sass package. +// +// @include motion-ui-transitions; +// @include motion-ui-animations; +@import 'motion-ui/motion-ui'; +@include motion-ui-transitions; +@include motion-ui-animations; + + diff --git a/app/assets/stylesheets/recipe.scss b/app/assets/stylesheets/recipe.scss new file mode 100644 index 000000000..e7c0bf6d0 --- /dev/null +++ b/app/assets/stylesheets/recipe.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Recipe controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..09705d12a --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::Base +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/controllers/recipe_controller.rb b/app/controllers/recipe_controller.rb new file mode 100644 index 000000000..ffcf27758 --- /dev/null +++ b/app/controllers/recipe_controller.rb @@ -0,0 +1,33 @@ +class RecipeController < ApplicationController + def index + query = params["query"] + + results = EdamamApiWrapper.recipe_search(query) + @recipes = results.paginate(:page => params[:page], :per_page => 10) + + if @recipes.length > 0 + flash[:success] = "#{@recipes.length} Recipes Found!" + else + flash[:alert] = "No Recipes Found :(" + end + end + + def create + end + + def show + @recipe = EdamamApiWrapper.get_recipe(params[:uri]) + end + + def new + end + + def destroy + end + + def edit + end + + def update + end +end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb new file mode 100644 index 000000000..de6be7945 --- /dev/null +++ b/app/helpers/application_helper.rb @@ -0,0 +1,2 @@ +module ApplicationHelper +end diff --git a/app/helpers/recipe_helper.rb b/app/helpers/recipe_helper.rb new file mode 100644 index 000000000..57b4c1e99 --- /dev/null +++ b/app/helpers/recipe_helper.rb @@ -0,0 +1,2 @@ +module RecipeHelper +end diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..a009ace51 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb new file mode 100644 index 000000000..cd6000489 --- /dev/null +++ b/app/views/layouts/application.html.erb @@ -0,0 +1,19 @@ + + + + + + + <%= content_for?(:title) ? yield(:title) : "Untitled" %> + + <%= stylesheet_link_tag "application" %> + <%= javascript_include_tag "application", 'data-turbolinks-track' => true %> + <%= csrf_meta_tags %> + + + + + <%= yield %> + + + diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 000000000..37f0bddbd --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/app/views/recipe/create.html.erb b/app/views/recipe/create.html.erb new file mode 100644 index 000000000..18a3c598c --- /dev/null +++ b/app/views/recipe/create.html.erb @@ -0,0 +1,2 @@ +

Recipe#create

+

Find me in app/views/recipe/create.html.erb

diff --git a/app/views/recipe/destroy.html.erb b/app/views/recipe/destroy.html.erb new file mode 100644 index 000000000..b80863b16 --- /dev/null +++ b/app/views/recipe/destroy.html.erb @@ -0,0 +1,2 @@ +

Recipe#destroy

+

Find me in app/views/recipe/destroy.html.erb

diff --git a/app/views/recipe/edit.html.erb b/app/views/recipe/edit.html.erb new file mode 100644 index 000000000..286f084a8 --- /dev/null +++ b/app/views/recipe/edit.html.erb @@ -0,0 +1,2 @@ +

Recipe#edit

+

Find me in app/views/recipe/edit.html.erb

diff --git a/app/views/recipe/index.html.erb b/app/views/recipe/index.html.erb new file mode 100644 index 000000000..f6daaea5b --- /dev/null +++ b/app/views/recipe/index.html.erb @@ -0,0 +1,13 @@ +
+

Recipes

+ <% if @recipes %> + + + <% end %> +
+ + <%= will_paginate @recipes, class: "row" %> diff --git a/app/views/recipe/new.html.erb b/app/views/recipe/new.html.erb new file mode 100644 index 000000000..a2752b293 --- /dev/null +++ b/app/views/recipe/new.html.erb @@ -0,0 +1,8 @@ +

Muncher

+ +<%= form_tag results_path, method: "get" do %> + <%= label_tag(:query, "What would you like to find?") %> + <%= text_field_tag(:query) %> + <%= submit_tag("Send") %> + +<% end %> diff --git a/app/views/recipe/show.html.erb b/app/views/recipe/show.html.erb new file mode 100644 index 000000000..07d1a0601 --- /dev/null +++ b/app/views/recipe/show.html.erb @@ -0,0 +1,32 @@ +
+

<%= @recipe.label %>

+<% if @recipe.image %> + <%= image_tag(@recipe.image, size: "300") %> +<% end %> + +

Ingredients

+ <% if @recipe.ingredients %> + + <% else %> + Ingredient Information Not Available + <% end %> + + <% if @recipe.url %> + <%= link_to "See Original Recipe", @recipe.url %> + <% end %> + +

Nutrition

+ <% if @recipe.diet %> + + <% else %> + Nutrition Information Not Available + <% end %> +
diff --git a/app/views/recipe/update.html.erb b/app/views/recipe/update.html.erb new file mode 100644 index 000000000..dfa8e2663 --- /dev/null +++ b/app/views/recipe/update.html.erb @@ -0,0 +1,2 @@ +

Recipe#update

+

Find me in app/views/recipe/update.html.erb

diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..f19acf5b5 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..5badb2fde --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 000000000..d87d5f578 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 000000000..94fd4d797 --- /dev/null +++ b/bin/setup @@ -0,0 +1,36 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # Install JavaScript dependencies if using Yarn + # system('bin/yarn') + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:setup' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..fb2ec2ebb --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == "spring" } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/bin/update b/bin/update new file mode 100755 index 000000000..58bfaed51 --- /dev/null +++ b/bin/update @@ -0,0 +1,31 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # Install JavaScript dependencies if using Yarn + # system('bin/yarn') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/yarn b/bin/yarn new file mode 100755 index 000000000..460dd565b --- /dev/null +++ b/bin/yarn @@ -0,0 +1,11 @@ +#!/usr/bin/env ruby +APP_ROOT = File.expand_path('..', __dir__) +Dir.chdir(APP_ROOT) do + begin + exec "yarnpkg", *ARGV + rescue Errno::ENOENT + $stderr.puts "Yarn executable was not detected in the system." + $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install" + exit 1 + end +end diff --git a/config.ru b/config.ru new file mode 100644 index 000000000..f7ba0b527 --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 000000000..84efe2645 --- /dev/null +++ b/config/application.rb @@ -0,0 +1,28 @@ +require_relative 'boot' + +require 'rails/all' + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module ApiMuncher + class Application < Rails::Application + config.generators do |g| + # Force new test files to be generated in the minitest-spec style + g.test_framework :minitest, spec: true + + # Always use .js files, never .coffee + g.javascript_engine :js + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 5.2 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration can go into files in config/initializers + # -- all .rb files in that directory are automatically loaded after loading + # the framework and any gems in your application. + + config.eager_load_paths << Rails.root.join('lib') + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..b9e460cef --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,4 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..cf3ce7efa --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: api-muncher_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 000000000..ff030f5b1 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +5LJ7qpUP+yEl/2WQWuWaOAsW4OlxDKI+z6WUfk/Ac9E2OfD6qUjusRYk6zTVWMDTP/P7drew6JE4/mGhBujMQFxIpbUgHU1Pnex+VR0evgrfUwiGkhPByZ4GpWMrBG/tY/XiL9TO4HP8q8dCR5l8YNF9CMZX8xa531a8m0S34FMMEoi8r1/UrxBJMrM5bSnquieugBgd3GPyFvprutSfJrn/T2piVHIsmoL0clVVyM71HjRf2Xctpo9F/1p6NH7XBR2dSW0Q5Ge0cLED3/5YJGZGxK9c6YgvOpheFwPsAzVqUXb1Pym70Yu/VG4fPQpq+Xg502tBytmMsoaHMtYd86GShREI+57CkqxzrDya6DtE8yBqrsJKj41ISb+ca0+3P+zxdNsByunQnp74CPOOxb3ebYWaBU7mc+f5--bn/Y3YyeHYOTV4GZ--+1aa6tjj26P3DaPSVOnFBA== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..4cb63a555 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: api-muncher_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: api-muncher + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: api-muncher_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: api-muncher_production + username: api-muncher + password: <%= ENV['API-MUNCHER_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..1311e3e4e --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,61 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + # Debug mode disables concatenation and preprocessing of assets. + # This option may cause significant delays in view rendering with a large + # number of complex assets. + config.assets.debug = true + + # Suppress logger output for asset requests. + config.assets.quiet = true + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..1d8a23cbf --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,94 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Compress JavaScripts and CSS. + config.assets.js_compressor = :uglifier + # config.assets.css_compressor = :sass + + # Do not fallback to assets pipeline if a precompiled asset is missed. + config.assets.compile = false + + # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "api-muncher_#{Rails.env}" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..0a38fd3ce --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,46 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb new file mode 100644 index 000000000..4b828e80c --- /dev/null +++ b/config/initializers/assets.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# Version of your assets, change this if you want to expire all your assets. +Rails.application.config.assets.version = '1.0' + +# Add additional assets to the asset load path. +# Rails.application.config.assets.paths << Emoji.images_path +# Add Yarn node_modules folder to the asset load path. +Rails.application.config.assets.paths << Rails.root.join('node_modules') + +# Precompile additional assets. +# application.js, application.css, and all non-JS/CSS in the app/assets +# folder are already added. +# Rails.application.config.assets.precompile += %w( admin.js admin.css ) diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb new file mode 100644 index 000000000..d3bcaa5ec --- /dev/null +++ b/config/initializers/content_security_policy.rb @@ -0,0 +1,25 @@ +# Be sure to restart your server when you modify this file. + +# Define an application-wide content security policy +# For further information see the following documentation +# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy + +# Rails.application.config.content_security_policy do |policy| +# policy.default_src :self, :https +# policy.font_src :self, :https, :data +# policy.img_src :self, :https, :data +# policy.object_src :none +# policy.script_src :self, :https +# policy.style_src :self, :https + +# # Specify URI for violation reports +# # policy.report_uri "/csp-violation-report-endpoint" +# end + +# If you are using UJS then enable automatic nonce generation +# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) } + +# Report CSP violations to a specified URI +# For further information see the following documentation: +# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only +# Rails.application.config.content_security_policy_report_only = true diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb new file mode 100644 index 000000000..5a6a32d37 --- /dev/null +++ b/config/initializers/cookies_serializer.rb @@ -0,0 +1,5 @@ +# Be sure to restart your server when you modify this file. + +# Specify a serializer for the signed and encrypted cookie jars. +# Valid options are :json, :marshal, and :hybrid. +Rails.application.config.action_dispatch.cookies_serializer = :json diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/will_paginate_array_fix.rb b/config/initializers/will_paginate_array_fix.rb new file mode 100644 index 000000000..dfed3fe9e --- /dev/null +++ b/config/initializers/will_paginate_array_fix.rb @@ -0,0 +1 @@ +require 'will_paginate/array' diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..decc5a857 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..a5eccf816 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,34 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..26772eb80 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,5 @@ +Rails.application.routes.draw do + root 'recipe#new' + get 'recipe/results', to: 'recipe#index', as: 'results' + get 'recipe/show', to: 'recipe#show', as: 'show' +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..9fa7863f9 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w[ + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +].each { |path| Spring.watch(path) } diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..2611543b3 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,18 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 0) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + +end diff --git a/db/seeds.rb b/db/seeds.rb new file mode 100644 index 000000000..1beea2acc --- /dev/null +++ b/db/seeds.rb @@ -0,0 +1,7 @@ +# This file should contain all the record creation needed to seed the database with its default values. +# The data can then be loaded with the rails db:seed command (or created alongside the database with db:setup). +# +# Examples: +# +# movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) +# Character.create(name: 'Luke', movie: movies.first) diff --git a/lib/assets/.keep b/lib/assets/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/lib/edamam_api_wrapper.rb b/lib/edamam_api_wrapper.rb new file mode 100644 index 000000000..178afe341 --- /dev/null +++ b/lib/edamam_api_wrapper.rb @@ -0,0 +1,46 @@ +class EdamamApiWrapper + + BASE_URL = "https://api.edamam.com/search?" + TOKEN = ENV["EDAMAM_TOKEN"] + ID = ENV["EDAMAM_ID"] + + def self.recipe_search(terms) + + message_url = BASE_URL + "q=#{terms}&" + "app_id=#{ID}&" + "app_key=#{TOKEN}&to=50" + + response = HTTParty.get(message_url) + + recipes = [] + if response["hits"] + response["hits"].each do |entry| + label = entry["recipe"]["label"] + uri = entry["recipe"]["uri"] + recipes << Recipe.new(label, uri) + end + end + + return recipes + end + + def self.get_recipe(uri) + terms = URI.encode(uri) + message_url = BASE_URL + "r=#{terms}&" + "app_id=#{ID}&" + "app_key=#{TOKEN}&to=50" + response = HTTParty.get(message_url) + + if response + label = response[0]["label"] + image = response[0]["image"] + if image == nil + image = "https://www.foodiesfeed.com/wp-content/uploads/2018/03/blueberries-heart-349x233.jpg" + end + url = response[0]["url"] + ingredients = response[0]["ingredientLines"] + diet = response[0]["healthLabels"] + recipe = Recipe.new(label, uri, options = { image: image, url: url, ingredients: ingredients, diet: diet }) + end + + return recipe + + end + +end diff --git a/lib/recipe.rb b/lib/recipe.rb new file mode 100644 index 000000000..387269a6c --- /dev/null +++ b/lib/recipe.rb @@ -0,0 +1,14 @@ +class Recipe + attr_reader :label, :uri, :options, :ingredients, :image, :diet, :url + + + def initialize(label, uri, options = {}) + @label = label + @uri = uri + @url = options[:url] + @ingredients = options[:ingredients] + @image = options[:image] + @diet = options[:diet] + end + +end diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/package.json b/package.json new file mode 100644 index 000000000..5da55eadc --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "name": "api-muncher", + "private": true, + "dependencies": {} +} diff --git a/public/404.html b/public/404.html new file mode 100644 index 000000000..2be3af26f --- /dev/null +++ b/public/404.html @@ -0,0 +1,67 @@ + + + + The page you were looking for doesn't exist (404) + + + + + + +
+
+

The page you were looking for doesn't exist.

+

You may have mistyped the address or the page may have moved.

+
+

If you are the application owner check the logs for more information.

+
+ + diff --git a/public/422.html b/public/422.html new file mode 100644 index 000000000..c08eac0d1 --- /dev/null +++ b/public/422.html @@ -0,0 +1,67 @@ + + + + The change you wanted was rejected (422) + + + + + + +
+
+

The change you wanted was rejected.

+

Maybe you tried to change something you didn't have access to.

+
+

If you are the application owner check the logs for more information.

+
+ + diff --git a/public/500.html b/public/500.html new file mode 100644 index 000000000..78a030af2 --- /dev/null +++ b/public/500.html @@ -0,0 +1,66 @@ + + + + We're sorry, but something went wrong (500) + + + + + + +
+
+

We're sorry, but something went wrong.

+
+

If you are the application owner check the logs for more information.

+
+ + diff --git a/public/apple-touch-icon-precomposed.png b/public/apple-touch-icon-precomposed.png new file mode 100644 index 000000000..e69de29bb diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png new file mode 100644 index 000000000..e69de29bb diff --git a/public/favicon.ico b/public/favicon.ico new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..37b576a4a --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb new file mode 100644 index 000000000..d19212abd --- /dev/null +++ b/test/application_system_test_case.rb @@ -0,0 +1,5 @@ +require "test_helper" + +class ApplicationSystemTestCase < ActionDispatch::SystemTestCase + driven_by :selenium, using: :chrome, screen_size: [1400, 1400] +end diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/controllers/recipe_controller_test.rb b/test/controllers/recipe_controller_test.rb new file mode 100644 index 000000000..159563ac1 --- /dev/null +++ b/test/controllers/recipe_controller_test.rb @@ -0,0 +1,39 @@ +require "test_helper" + +describe RecipeController do + it "should get index" do + get recipe_index_url + value(response).must_be :success? + end + + it "should get new" do + get recipe_new_url + value(response).must_be :success? + end + + it "should get show" do + get recipe_show_url + value(response).must_be :success? + end + + it "should get edit" do + get recipe_edit_url + value(response).must_be :success? + end + + it "should get update" do + get recipe_update_url + value(response).must_be :success? + end + + it "should get destroy" do + get recipe_destroy_url + value(response).must_be :success? + end + + it "should get create" do + get recipe_create_url + value(response).must_be :success? + end + +end diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/helpers/.keep b/test/helpers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/system/.keep b/test/system/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..10594a324 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,26 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails" +require "minitest/reporters" # for Colorized output + +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From ea5280cfc3c67daa9b26a61a03ff433bb8b00257 Mon Sep 17 00:00:00 2001 From: Steffany Brown Date: Sun, 6 May 2018 13:46:13 -0700 Subject: [PATCH 02/12] trying removing https:// from BASE_URL --- Gemfile | 2 ++ lib/edamam_api_wrapper.rb | 4 ++-- test/test_helper.rb | 19 +++++++++++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 0a4142078..e9ad15fe3 100644 --- a/Gemfile +++ b/Gemfile @@ -43,6 +43,8 @@ group :development, :test do gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] gem 'minitest-vcr' gem 'webmock' + gem 'minitest-vcr' + gem 'webmock' end group :development do diff --git a/lib/edamam_api_wrapper.rb b/lib/edamam_api_wrapper.rb index 178afe341..aa59662f7 100644 --- a/lib/edamam_api_wrapper.rb +++ b/lib/edamam_api_wrapper.rb @@ -1,13 +1,13 @@ class EdamamApiWrapper - BASE_URL = "https://api.edamam.com/search?" + BASE_URL = "api.edamam.com/search?" TOKEN = ENV["EDAMAM_TOKEN"] ID = ENV["EDAMAM_ID"] def self.recipe_search(terms) message_url = BASE_URL + "q=#{terms}&" + "app_id=#{ID}&" + "app_key=#{TOKEN}&to=50" - + response = HTTParty.get(message_url) recipes = [] diff --git a/test/test_helper.rb b/test/test_helper.rb index 10594a324..8d2a352b5 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -3,6 +3,25 @@ require "rails/test_help" require "minitest/rails" require "minitest/reporters" # for Colorized output +require 'vcr' +require 'webmock/minitest' + +VCR.configure do |config| + config.cassette_library_dir = 'test/cassettes' + config.hook_into :webmock + config.default_cassette_options = { + :record => :new_episodes, + :match_requests_on => [:method, :uri, :body] + } + + config.filter_sensitive_data("") do + ENV['EDAMAM_TOKEN'] + end + + config.filter_sensitive_data("") do + ENV['EDAMAM_ID'] + end +end # For colorful output! Minitest::Reporters.use!( From 12df197cceefb332eff6713bf769ffe68123daa5 Mon Sep 17 00:00:00 2001 From: Steffany Brown Date: Sun, 6 May 2018 13:47:29 -0700 Subject: [PATCH 03/12] returned to original BASE_URL --- lib/edamam_api_wrapper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edamam_api_wrapper.rb b/lib/edamam_api_wrapper.rb index aa59662f7..6b4d44ebe 100644 --- a/lib/edamam_api_wrapper.rb +++ b/lib/edamam_api_wrapper.rb @@ -1,6 +1,6 @@ class EdamamApiWrapper - BASE_URL = "api.edamam.com/search?" + BASE_URL = "https://api.edamam.com/search?" TOKEN = ENV["EDAMAM_TOKEN"] ID = ENV["EDAMAM_ID"] From 4691d8d7973311a338c5d8f918e047db3e0d98b0 Mon Sep 17 00:00:00 2001 From: Steffany Brown Date: Sun, 6 May 2018 14:20:35 -0700 Subject: [PATCH 04/12] created search partial view, added more html to Recipe#index view --- app/views/recipe/_search.html.erb | 7 +++++ app/views/recipe/index.html.erb | 45 +++++++++++++++++++++++-------- app/views/recipe/new.html.erb | 7 +---- lib/edamam_api_wrapper.rb | 3 ++- 4 files changed, 44 insertions(+), 18 deletions(-) create mode 100644 app/views/recipe/_search.html.erb diff --git a/app/views/recipe/_search.html.erb b/app/views/recipe/_search.html.erb new file mode 100644 index 000000000..0e25af279 --- /dev/null +++ b/app/views/recipe/_search.html.erb @@ -0,0 +1,7 @@ + +<%= form_tag results_path, method: "get" do %> + <%= label_tag(:query, "What would you like to find?") %> + <%= text_field_tag(:query) %> + <%= submit_tag("Send") %> + +<% end %> diff --git a/app/views/recipe/index.html.erb b/app/views/recipe/index.html.erb index f6daaea5b..100acdde3 100644 --- a/app/views/recipe/index.html.erb +++ b/app/views/recipe/index.html.erb @@ -1,13 +1,36 @@ -
-

Recipes

- <% if @recipes %> -
    - <% @recipes.each do |entry| %> -
  • <%= link_to entry.label, { action: 'show', :uri => entry.uri } %>
    • - <% end %> -
- - <% end %> -
+ + + + + +
+
+
+

Welcome to My Showcase

+

+ <%= render "search" %>

+ + + <% if @recipes %> +
    + <% @recipes.each do |entry| %> +
  • +
    +
    + <%= link_to entry.label, { action: 'show', :uri => entry.uri } %>
    • +
+
+ <%= image_tag(entry.image) %> + + <% end %> + + <% end %> +
+ + + <%= will_paginate @recipes, class: "row" %> + + + diff --git a/app/views/recipe/new.html.erb b/app/views/recipe/new.html.erb index a2752b293..eaabead75 100644 --- a/app/views/recipe/new.html.erb +++ b/app/views/recipe/new.html.erb @@ -1,8 +1,3 @@

Muncher

-<%= form_tag results_path, method: "get" do %> - <%= label_tag(:query, "What would you like to find?") %> - <%= text_field_tag(:query) %> - <%= submit_tag("Send") %> - -<% end %> +<%= render "search" %> diff --git a/lib/edamam_api_wrapper.rb b/lib/edamam_api_wrapper.rb index 6b4d44ebe..792293684 100644 --- a/lib/edamam_api_wrapper.rb +++ b/lib/edamam_api_wrapper.rb @@ -15,7 +15,8 @@ def self.recipe_search(terms) response["hits"].each do |entry| label = entry["recipe"]["label"] uri = entry["recipe"]["uri"] - recipes << Recipe.new(label, uri) + image = entry["recipe"]["image"] + recipes << Recipe.new(label, uri, options = { image: image }) end end From d00dacf7c4f954a1d8903814e0dc735f7e560fd2 Mon Sep 17 00:00:00 2001 From: Steffany Brown Date: Sun, 6 May 2018 17:54:02 -0700 Subject: [PATCH 05/12] added css for main Recipe#new and updated html --- app/assets/stylesheets/application.css | 19 ------- app/assets/stylesheets/main_search.css | 79 ++++++++++++++++++++++++++ app/assets/stylesheets/search.css | 72 +++++++++++++++++++++++ app/views/layouts/application.html.erb | 2 + app/views/recipe/index.html.erb | 46 +++++---------- app/views/recipe/new.html.erb | 17 +++++- config/initializers/assets.rb | 2 + 7 files changed, 184 insertions(+), 53 deletions(-) create mode 100644 app/assets/stylesheets/main_search.css create mode 100644 app/assets/stylesheets/search.css diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 3a3841832..e69de29bb 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -1,19 +0,0 @@ -/* - * 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, 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 other CSS/SCSS - * files in this directory. Styles in this file should be added after the last require_* statement. - * It is generally better to create a new file per style scope. - *= require normalize-rails - - * - *= require_tree . - *= require_self - *= require foundation_and_overrides - - */ diff --git a/app/assets/stylesheets/main_search.css b/app/assets/stylesheets/main_search.css new file mode 100644 index 000000000..b5384fe7d --- /dev/null +++ b/app/assets/stylesheets/main_search.css @@ -0,0 +1,79 @@ +body { + margin: 0px; +} +.search_container { + background: #F8A434; + font-family: 'Lato', sans-serif; + color: #FDFCFB; + text-align: center; +} + + +.search_container form { + width: 450px; + margin: 17% auto; +} + + +.search_container .header { + font-size: 35px; + text-transform: uppercase; + letter-spacing: 5px; +} + + +.search_container .description { + font-size: 14px; + letter-spacing: 1px; + line-height: 1.3em; + margin: -2px 0 45px; +} + + +.search_container .input { + display: flex; + align-items: center; +} + + +.search_container .button { + height: 44px; + border: none; +} + + +.search_container #input { + width: 75%; + background: #FDFCFB; + font-family: inherit; + color: #737373; + letter-spacing: 1px; + text-indent: 5%; + border-radius: 5px 0 0 5px; +} + + +.search_container #submit { + width: 25%; + height: 46px; + background: #E86C8D; + font-family: inherit; + font-weight: bold; + color: inherit; + letter-spacing: 1px; + border-radius: 0 5px 5px 0; + cursor: pointer; + transition: background .3s ease-in-out; +} + + +.search_container #submit:hover { + background: #d45d7d; +} + + +.search_container input:focus { + outline: none; + outline: 2px solid #E86C8D; + box-shadow: 0 0 2px #E86C8D; +} diff --git a/app/assets/stylesheets/search.css b/app/assets/stylesheets/search.css new file mode 100644 index 000000000..11af6dd50 --- /dev/null +++ b/app/assets/stylesheets/search.css @@ -0,0 +1,72 @@ +.results-container { + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: space-evenly; + align-items: center; + align-content: space-around; +} + + +.image-wrapper { + width: 300px; + height: 300px; + border: 1px solid rgba(0, 0, 0, 0.04); + overflow: hidden; + position: relative; + text-align: center; + border-radius: 4px; + margin: 0px; +} + +.image-overlay-content { + width: 100%; + height: 100%; + position: absolute; + overflow: hidden; + top: 0; + left: 0; } + +.overlay-fade-in p { + letter-spacing: 0.15em; + color: #f4f4f4; + font-size: 28px; + opacity: 0; + transition: all 0.2s linear; } +.overlay-fade-in img { + transition: all 0.2s linear; } +.overlay-fade-in .image-overlay-content { + opacity: 0; + background-color: rgba(0, 0, 0, 0.4); + transition: all 0.4s ease-in-out; } +.overlay-fade-in h2 { + color: #f2f2f2; + font-size: 1.8rem; + margin-top: 40%; + opacity: 0; + transition: all 0.2s ease-in-out; + background: rgba(0, 0, 0, 0.7); } +.overlay-fade-in .button { + display: inline-block; + text-decoration: none; + padding: 7px 14px; + background: #FFF; + color: #222; + text-transform: uppercase; + box-shadow: 0 0 1px #000; + position: relative; + border: 1px solid #999; + opacity: 0; + transition: all 0.2s ease-in-out; } + .overlay-fade-in .button:hover { + box-shadow: 0 0 5px #000; } +.overlay-fade-in:hover img { + transform: scale(1.2); } +.overlay-fade-in:hover .image-overlay-content { + opacity: 1; } +.overlay-fade-in:hover h2, .overlay-fade-in p, .overlay-fade-in .button { + opacity: 1; } +.overlay-fade-in:hover p { + transition-delay: 0.1s; } +.overlay-fade-in:hover .button { + transition-delay: 0.2s; } diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index cd6000489..987fcb219 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -11,6 +11,8 @@ <%= csrf_meta_tags %> + <%= render "search" %> + <%= yield %> diff --git a/app/views/recipe/index.html.erb b/app/views/recipe/index.html.erb index 100acdde3..1e408830f 100644 --- a/app/views/recipe/index.html.erb +++ b/app/views/recipe/index.html.erb @@ -1,36 +1,18 @@ +<%= stylesheet_link_tag "search" %> - +
+ <% if @recipes %> + <% @recipes.each do |entry| %> +
+ <%= image_tag(entry.image, alt: "recipe image") %> - -
-
-
-

Welcome to My Showcase

-

- <%= render "search" %>

+
+

<%= link_to entry.label, { action: 'show', :uri => entry.uri }, class: "button" %>

+
+
+ <% end %> + <% end %> +
- - <% if @recipes %> -
    - <% @recipes.each do |entry| %> -
  • -
    -
    - <%= link_to entry.label, { action: 'show', :uri => entry.uri } %>
    • - - - <%= image_tag(entry.image) %> - - <% end %> -
- <% end %> - - - - - - <%= will_paginate @recipes, class: "row" %> - - - +<%= will_paginate @recipes, class: "row" %> diff --git a/app/views/recipe/new.html.erb b/app/views/recipe/new.html.erb index eaabead75..3bdcc77fc 100644 --- a/app/views/recipe/new.html.erb +++ b/app/views/recipe/new.html.erb @@ -1,3 +1,16 @@ -

Muncher

+<%= stylesheet_link_tag "main_search" %> -<%= render "search" %> +
+ <%= form_tag results_path, method: "get" do %> +
+

YUM MUNCHER

+
+
+

What would you like to find?

+
+
+ <%= text_field_tag(:query, nil, class: "button", id: "input") %> + <%= submit_tag("Send", class: "button", id: "submit") %> +
+ <% end %> +
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index 4b828e80c..767679b71 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -12,3 +12,5 @@ # application.js, application.css, and all non-JS/CSS in the app/assets # folder are already added. # Rails.application.config.assets.precompile += %w( admin.js admin.css ) +Rails.application.config.assets.precompile += %w( search.css ) +Rails.application.config.assets.precompile += %w( main_search.css ) From 7bc9883921e24dac8c3d75e44f848df33ff35401 Mon Sep 17 00:00:00 2001 From: Steffany Brown Date: Sun, 6 May 2018 23:00:59 -0700 Subject: [PATCH 06/12] added styling for root --- app/assets/stylesheets/main_search.css | 46 ++++++++++++++++++-------- app/assets/stylesheets/search.css | 10 ++++-- app/views/layouts/application.html.erb | 4 +++ app/views/recipe/new.html.erb | 12 ++++--- 4 files changed, 53 insertions(+), 19 deletions(-) diff --git a/app/assets/stylesheets/main_search.css b/app/assets/stylesheets/main_search.css index b5384fe7d..eeeb3e220 100644 --- a/app/assets/stylesheets/main_search.css +++ b/app/assets/stylesheets/main_search.css @@ -1,11 +1,27 @@ +html, body { + height:55%; + padding: 0; + margin: 0; + background:url(https://www.foodiesfeed.com/wp-content/uploads/2015/05/homemade-bun-with-tea-and-a-book.jpg) no-repeat center center fixed; + +} + + +body { + background:rgba(255,255,255,0.5); /* applies a 50% transparent white background */ +} + body { margin: 0px; + /* background: #F8A434; */ } + .search_container { - background: #F8A434; - font-family: 'Lato', sans-serif; - color: #FDFCFB; + /* background: #F8A434; */ + font-family: 'Gudea', sans-serif; + color: black; text-align: center; + } @@ -15,18 +31,22 @@ body { } -.search_container .header { - font-size: 35px; +.search_container header p { + font-size: 50px; text-transform: uppercase; letter-spacing: 5px; + padding-top: 40px; + margin-bottom: 5px; + font-family: 'Do Hyeon'; } .search_container .description { - font-size: 14px; + font-size: 18px; letter-spacing: 1px; line-height: 1.3em; - margin: -2px 0 45px; + margin: -2px 0 25px; + padding-top: 10px; } @@ -44,9 +64,9 @@ body { .search_container #input { width: 75%; - background: #FDFCFB; + background: #B0C4DE; font-family: inherit; - color: #737373; + color: black; letter-spacing: 1px; text-indent: 5%; border-radius: 5px 0 0 5px; @@ -56,7 +76,7 @@ body { .search_container #submit { width: 25%; height: 46px; - background: #E86C8D; + background: #6E7B8B; font-family: inherit; font-weight: bold; color: inherit; @@ -68,12 +88,12 @@ body { .search_container #submit:hover { - background: #d45d7d; + background: #344152; } .search_container input:focus { outline: none; - outline: 2px solid #E86C8D; - box-shadow: 0 0 2px #E86C8D; + outline: 2px solid #344152; + box-shadow: 0 0 2px #344152; } diff --git a/app/assets/stylesheets/search.css b/app/assets/stylesheets/search.css index 11af6dd50..0015f5449 100644 --- a/app/assets/stylesheets/search.css +++ b/app/assets/stylesheets/search.css @@ -1,3 +1,8 @@ +body { + margin: 0px; + background: #F8A434; +} + .results-container { display: flex; flex-direction: row; @@ -5,12 +10,13 @@ justify-content: space-evenly; align-items: center; align-content: space-around; + } .image-wrapper { - width: 300px; - height: 300px; + width: 250px; + height: 250px; border: 1px solid rgba(0, 0, 0, 0.04); overflow: hidden; position: relative; diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 987fcb219..a32b3f82a 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,4 +1,6 @@ + + @@ -11,7 +13,9 @@ <%= csrf_meta_tags %> +<% unless controller_name=="recipe" && action_name=='new' %> <%= render "search" %> +<% end %> diff --git a/app/views/recipe/new.html.erb b/app/views/recipe/new.html.erb index 3bdcc77fc..9eaba1a24 100644 --- a/app/views/recipe/new.html.erb +++ b/app/views/recipe/new.html.erb @@ -1,16 +1,20 @@ + + <%= stylesheet_link_tag "main_search" %>
<%= form_tag results_path, method: "get" do %> -
+

YUM MUNCHER

-
+
-

What would you like to find?

+

What would you like to cook?

<%= text_field_tag(:query, nil, class: "button", id: "input") %> - <%= submit_tag("Send", class: "button", id: "submit") %> + <%= submit_tag("Get Recipes", class: "button", id: "submit") %>
<% end %>
+ + From 4885b5f512978940f519d0b8658ddd31d513e6c4 Mon Sep 17 00:00:00 2001 From: Steffany Brown Date: Mon, 7 May 2018 00:35:54 -0700 Subject: [PATCH 07/12] added index css and updated view --- app/assets/stylesheets/application.css | 88 ++++++++++++++++++++++++++ app/assets/stylesheets/main_search.css | 7 +- app/assets/stylesheets/search.css | 52 +++++++++++---- app/views/layouts/application.html.erb | 27 +++++--- app/views/recipe/_search.html.erb | 15 +++-- app/views/recipe/create.html.erb | 2 - app/views/recipe/destroy.html.erb | 2 - app/views/recipe/edit.html.erb | 2 - app/views/recipe/index.html.erb | 10 ++- app/views/recipe/update.html.erb | 2 - 10 files changed, 160 insertions(+), 47 deletions(-) delete mode 100644 app/views/recipe/create.html.erb delete mode 100644 app/views/recipe/destroy.html.erb delete mode 100644 app/views/recipe/edit.html.erb delete mode 100644 app/views/recipe/update.html.erb diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index e69de29bb..b52c98925 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -0,0 +1,88 @@ +nav { + width: 100%; + display: flex; + flex-flow: column; + justify-content: center; + align-items: center; + margin-top: 40px; +} + +.results-header { + background:rgba(255,255,255,0.5); + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: space-between; + align-items: center; + align-content: space-around; + width: 80%; + padding-left: 30px; + padding-right: 30px; + padding-top: 20px; + padding-bottom: 20px; + + +} + +.results-header h1 { + font-family: 'Do Hyeon'; + font-size: 40px; +} + +.results-header h1 a { + text-decoration: none; + color: black; +} + + +.search_container form { + width: 300px; +} + +.search_container .input-container { + display: flex; + align-items: center; +} + + +.search_container .button { + height: 44px; + border: none; +} + + +.search_container #input { + width: 65%; + background: #B0C4DE; + font-family: inherit; + color: black; + letter-spacing: 1px; + text-indent: 5%; + border-radius: 5px 0 0 5px; +} + + +.search_container #submit { + width: 30%; + height: 46px; + background: #6E7B8B; + font-family: inherit; + font-weight: bold; + color: inherit; + letter-spacing: 1px; + border-radius: 0 5px 5px 0; + cursor: pointer; + transition: background .3s ease-in-out; +} + + +.search_container #submit:hover { + background: #344152; +} + + +.search_container input:focus { + outline: none; + outline: 2px solid #344152; + box-shadow: 0 0 2px #344152; +} diff --git a/app/assets/stylesheets/main_search.css b/app/assets/stylesheets/main_search.css index eeeb3e220..74515c44a 100644 --- a/app/assets/stylesheets/main_search.css +++ b/app/assets/stylesheets/main_search.css @@ -1,5 +1,5 @@ html, body { - height:55%; + height:58%; padding: 0; margin: 0; background:url(https://www.foodiesfeed.com/wp-content/uploads/2015/05/homemade-bun-with-tea-and-a-book.jpg) no-repeat center center fixed; @@ -8,13 +8,10 @@ html, body { body { + margin: 0px; background:rgba(255,255,255,0.5); /* applies a 50% transparent white background */ } -body { - margin: 0px; - /* background: #F8A434; */ -} .search_container { /* background: #F8A434; */ diff --git a/app/assets/stylesheets/search.css b/app/assets/stylesheets/search.css index 0015f5449..8b3a5e94a 100644 --- a/app/assets/stylesheets/search.css +++ b/app/assets/stylesheets/search.css @@ -1,28 +1,47 @@ -body { - margin: 0px; - background: #F8A434; +html, body { + padding: 0; + margin: 0; + background:url(https://www.foodiesfeed.com/wp-content/uploads/2015/05/homemade-bun-with-tea-and-a-book.jpg) no-repeat center center fixed; + } + +main { + overflow: hidden; + position: absolute; + width: 100%; + display: flex; + flex-flow: column; + justify-content: center; /*centers items on the line (the x-axis by default)*/ + align-items: center; /*centers items on the cross-axis (y by default)*/ + } .results-container { + background:rgba(255,255,255,0.5); display: flex; flex-direction: row; flex-wrap: wrap; justify-content: space-evenly; align-items: center; align-content: space-around; + width: 80%; + padding-left: 30px; + padding-right: 30px; + padding-top: 20px; + padding-bottom: 20px; } .image-wrapper { - width: 250px; - height: 250px; + width: 200px; + height: 200px; border: 1px solid rgba(0, 0, 0, 0.04); overflow: hidden; position: relative; text-align: center; border-radius: 4px; - margin: 0px; + margin: 5px; + } .image-overlay-content { @@ -36,43 +55,48 @@ body { .overlay-fade-in p { letter-spacing: 0.15em; color: #f4f4f4; - font-size: 28px; + font-size: 22px; opacity: 0; transition: all 0.2s linear; } + .overlay-fade-in img { transition: all 0.2s linear; } + .overlay-fade-in .image-overlay-content { opacity: 0; background-color: rgba(0, 0, 0, 0.4); transition: all 0.4s ease-in-out; } + .overlay-fade-in h2 { color: #f2f2f2; - font-size: 1.8rem; + font-size: 1.2rem; margin-top: 40%; opacity: 0; transition: all 0.2s ease-in-out; background: rgba(0, 0, 0, 0.7); } + + .overlay-fade-in .button { display: inline-block; text-decoration: none; padding: 7px 14px; - background: #FFF; - color: #222; + color: white; text-transform: uppercase; - box-shadow: 0 0 1px #000; position: relative; - border: 1px solid #999; opacity: 0; transition: all 0.2s ease-in-out; } - .overlay-fade-in .button:hover { - box-shadow: 0 0 5px #000; } + .overlay-fade-in:hover img { transform: scale(1.2); } + .overlay-fade-in:hover .image-overlay-content { opacity: 1; } + .overlay-fade-in:hover h2, .overlay-fade-in p, .overlay-fade-in .button { opacity: 1; } + .overlay-fade-in:hover p { transition-delay: 0.1s; } + .overlay-fade-in:hover .button { transition-delay: 0.2s; } diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index a32b3f82a..94372eaf7 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -2,24 +2,31 @@ + + - <%= content_for?(:title) ? yield(:title) : "Untitled" %> + <%= content_for?(:title) ? yield(:title) : "YUM MUNCHER" %> + <% unless controller_name=="recipe" && action_name=='new' %> + <%= stylesheet_link_tag "application" %> + <%= javascript_include_tag "application", 'data-turbolinks-track' => true %> + <%= csrf_meta_tags %> + - <%= stylesheet_link_tag "application" %> - <%= javascript_include_tag "application", 'data-turbolinks-track' => true %> - <%= csrf_meta_tags %> - + + <% end %> -<% unless controller_name=="recipe" && action_name=='new' %> - <%= render "search" %> -<% end %> - <%= yield %> - diff --git a/app/views/recipe/_search.html.erb b/app/views/recipe/_search.html.erb index 0e25af279..cf308eba5 100644 --- a/app/views/recipe/_search.html.erb +++ b/app/views/recipe/_search.html.erb @@ -1,7 +1,8 @@ - -<%= form_tag results_path, method: "get" do %> - <%= label_tag(:query, "What would you like to find?") %> - <%= text_field_tag(:query) %> - <%= submit_tag("Send") %> - -<% end %> +
+ <%= form_tag results_path, method: "get" do %> +
+ <%= text_field_tag(:query, nil, class: "button", id: "input") %> + <%= submit_tag("Get Recipes", class: "button", id: "submit") %> +
+ <% end %> +
diff --git a/app/views/recipe/create.html.erb b/app/views/recipe/create.html.erb deleted file mode 100644 index 18a3c598c..000000000 --- a/app/views/recipe/create.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

Recipe#create

-

Find me in app/views/recipe/create.html.erb

diff --git a/app/views/recipe/destroy.html.erb b/app/views/recipe/destroy.html.erb deleted file mode 100644 index b80863b16..000000000 --- a/app/views/recipe/destroy.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

Recipe#destroy

-

Find me in app/views/recipe/destroy.html.erb

diff --git a/app/views/recipe/edit.html.erb b/app/views/recipe/edit.html.erb deleted file mode 100644 index 286f084a8..000000000 --- a/app/views/recipe/edit.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

Recipe#edit

-

Find me in app/views/recipe/edit.html.erb

diff --git a/app/views/recipe/index.html.erb b/app/views/recipe/index.html.erb index 1e408830f..5b012c216 100644 --- a/app/views/recipe/index.html.erb +++ b/app/views/recipe/index.html.erb @@ -1,6 +1,7 @@ <%= stylesheet_link_tag "search" %> - + +
<% if @recipes %> <% @recipes.each do |entry| %> @@ -14,5 +15,8 @@ <% end %> <% end %>
- -<%= will_paginate @recipes, class: "row" %> +
+ <%= will_paginate @recipes, class: "row" %> +
+
+ diff --git a/app/views/recipe/update.html.erb b/app/views/recipe/update.html.erb deleted file mode 100644 index dfa8e2663..000000000 --- a/app/views/recipe/update.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

Recipe#update

-

Find me in app/views/recipe/update.html.erb

From be08451cbc98709c038502e28df3b89af6a2aca7 Mon Sep 17 00:00:00 2001 From: Steffany Brown Date: Mon, 7 May 2018 00:48:41 -0700 Subject: [PATCH 08/12] reverted main_search css --- app/assets/stylesheets/application.css | 14 ++++++++++++++ app/assets/stylesheets/main_search.css | 7 ++++--- app/assets/stylesheets/{search.css => results.css} | 0 app/views/recipe/index.html.erb | 2 +- config/initializers/assets.rb | 2 +- 5 files changed, 20 insertions(+), 5 deletions(-) rename app/assets/stylesheets/{search.css => results.css} (100%) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index b52c98925..365c775a5 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -44,12 +44,26 @@ nav { align-items: center; } +.search_container header p { + font-size: 50px; + text-transform: uppercase; + letter-spacing: 5px; + padding-top: 40px; + margin-bottom: 5px; + font-family: 'Do Hyeon'; +} + .search_container .button { height: 44px; border: none; } +.search_container .input { + display: flex; + align-items: center; +} + .search_container #input { width: 65%; diff --git a/app/assets/stylesheets/main_search.css b/app/assets/stylesheets/main_search.css index 74515c44a..a35fa86f2 100644 --- a/app/assets/stylesheets/main_search.css +++ b/app/assets/stylesheets/main_search.css @@ -1,5 +1,5 @@ html, body { - height:58%; + height:55%; padding: 0; margin: 0; background:url(https://www.foodiesfeed.com/wp-content/uploads/2015/05/homemade-bun-with-tea-and-a-book.jpg) no-repeat center center fixed; @@ -8,13 +8,14 @@ html, body { body { - margin: 0px; background:rgba(255,255,255,0.5); /* applies a 50% transparent white background */ } +body { + margin: 0px; +} .search_container { - /* background: #F8A434; */ font-family: 'Gudea', sans-serif; color: black; text-align: center; diff --git a/app/assets/stylesheets/search.css b/app/assets/stylesheets/results.css similarity index 100% rename from app/assets/stylesheets/search.css rename to app/assets/stylesheets/results.css diff --git a/app/views/recipe/index.html.erb b/app/views/recipe/index.html.erb index 5b012c216..99b8f8b2c 100644 --- a/app/views/recipe/index.html.erb +++ b/app/views/recipe/index.html.erb @@ -1,4 +1,4 @@ -<%= stylesheet_link_tag "search" %> +<%= stylesheet_link_tag "results" %>
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index 767679b71..95ce279a3 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -12,5 +12,5 @@ # application.js, application.css, and all non-JS/CSS in the app/assets # folder are already added. # Rails.application.config.assets.precompile += %w( admin.js admin.css ) -Rails.application.config.assets.precompile += %w( search.css ) +Rails.application.config.assets.precompile += %w( results.css ) Rails.application.config.assets.precompile += %w( main_search.css ) From 501ab98e1f4e05c240571f96bd02e52cd8b69c35 Mon Sep 17 00:00:00 2001 From: Steffany Brown Date: Mon, 7 May 2018 01:45:29 -0700 Subject: [PATCH 09/12] added show page css --- app/assets/stylesheets/application.css | 9 ---- app/assets/stylesheets/main_search.css | 3 -- app/assets/stylesheets/recipe_show.css | 61 ++++++++++++++++++++++++ app/views/recipe/index.html.erb | 3 +- app/views/recipe/show.html.erb | 66 +++++++++++++++----------- config/initializers/assets.rb | 1 + 6 files changed, 102 insertions(+), 41 deletions(-) create mode 100644 app/assets/stylesheets/recipe_show.css diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 365c775a5..a6bb650b5 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -44,15 +44,6 @@ nav { align-items: center; } -.search_container header p { - font-size: 50px; - text-transform: uppercase; - letter-spacing: 5px; - padding-top: 40px; - margin-bottom: 5px; - font-family: 'Do Hyeon'; -} - .search_container .button { height: 44px; diff --git a/app/assets/stylesheets/main_search.css b/app/assets/stylesheets/main_search.css index a35fa86f2..cde91ad63 100644 --- a/app/assets/stylesheets/main_search.css +++ b/app/assets/stylesheets/main_search.css @@ -11,9 +11,6 @@ body { background:rgba(255,255,255,0.5); /* applies a 50% transparent white background */ } -body { - margin: 0px; -} .search_container { font-family: 'Gudea', sans-serif; diff --git a/app/assets/stylesheets/recipe_show.css b/app/assets/stylesheets/recipe_show.css new file mode 100644 index 000000000..0916c4989 --- /dev/null +++ b/app/assets/stylesheets/recipe_show.css @@ -0,0 +1,61 @@ +html, main { + height:55%; + padding: 0; + margin: 0; + background:url(https://www.foodiesfeed.com/wp-content/uploads/2015/05/homemade-bun-with-tea-and-a-book.jpg) no-repeat center center fixed; +} + + +main { + width: 100%; + display: flex; + flex-flow: column; + justify-content: center; + align-items: center; + + } + +.show-container { + background:rgba(255,255,255,0.5); + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: space-evenly; + align-items: center; + align-content: space-around; + width: 80%; + padding-left: 30px; + padding-right: 30px; + padding-top: 20px; + padding-bottom: 20px; + +} + +.grid-container { + font-family: 'Gudea', sans-serif; + display: grid; + grid-template-columns: 300px 1fr; + grid-template-rows: auto; + grid-template-areas: + "image details" +} + +a { + font-weight: bold; + color: black; +} + +#picture { + grid-area: image; +} + +#details { + grid-area: details; + margin-left: 10px; +} + +h2 { + margin-top: 0px; + font-family: 'Do Hyeon'; + font-size: 40px; +} diff --git a/app/views/recipe/index.html.erb b/app/views/recipe/index.html.erb index 99b8f8b2c..9ba828d64 100644 --- a/app/views/recipe/index.html.erb +++ b/app/views/recipe/index.html.erb @@ -1,6 +1,6 @@ <%= stylesheet_link_tag "results" %> - +
<% if @recipes %> @@ -19,4 +19,3 @@ <%= will_paginate @recipes, class: "row" %>
- diff --git a/app/views/recipe/show.html.erb b/app/views/recipe/show.html.erb index 07d1a0601..7540facea 100644 --- a/app/views/recipe/show.html.erb +++ b/app/views/recipe/show.html.erb @@ -1,32 +1,44 @@ -
-

<%= @recipe.label %>

-<% if @recipe.image %> - <%= image_tag(@recipe.image, size: "300") %> -<% end %> +<%= stylesheet_link_tag "recipe_show" %> -

Ingredients

- <% if @recipe.ingredients %> -
    - <% @recipe.ingredients.each do |ingredient| %> -
  • <%= ingredient %>
    • + +
    +
    +
    + <% if @recipe.image %> +
    + <%= image_tag(@recipe.image, alt: "Picture of food", size: "300") %> + <% if @recipe.url %> +

    <%= link_to "See Original Recipe", @recipe.url %>

    + <% end %> +
    <% end %> -
- <% else %> - Ingredient Information Not Available - <% end %> - <% if @recipe.url %> - <%= link_to "See Original Recipe", @recipe.url %> - <% end %> +
+

<%= @recipe.label %>

+

Ingredients

+ <% if @recipe.ingredients %> +
    + <% @recipe.ingredients.each do |ingredient| %> +
  • <%= ingredient %>
    • + <% end %> +
+ <% else %> + Ingredient Information Not Available + <% end %> -

Nutrition

- <% if @recipe.diet %> -
    - <% @recipe.diet.each do |category| %> -
  • <%= category %>
    • +

    Nutrition

    + <% if @recipe.diet %> +
      + <% @recipe.diet.each do |category| %> +
    • <%= category %>
      • + <% end %> +
    + <% else %> + Nutrition Information Not Available <% end %> -
- <% else %> - Nutrition Information Not Available - <% end %> -
+
+ + +
+ + diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index 95ce279a3..68c9b8573 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -14,3 +14,4 @@ # Rails.application.config.assets.precompile += %w( admin.js admin.css ) Rails.application.config.assets.precompile += %w( results.css ) Rails.application.config.assets.precompile += %w( main_search.css ) +Rails.application.config.assets.precompile += %w( recipe_show.css ) From df48e9ba6b70c84cfb5f5a34a7998b0b6ca21718 Mon Sep 17 00:00:00 2001 From: Steffany Brown Date: Mon, 7 May 2018 01:59:03 -0700 Subject: [PATCH 10/12] added attribution --- app/assets/stylesheets/main_search.css | 6 ++++-- app/views/layouts/application.html.erb | 3 ++- app/views/recipe/index.html.erb | 1 + app/views/recipe/new.html.erb | 1 + app/views/recipe/show.html.erb | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/main_search.css b/app/assets/stylesheets/main_search.css index cde91ad63..abff144a8 100644 --- a/app/assets/stylesheets/main_search.css +++ b/app/assets/stylesheets/main_search.css @@ -3,9 +3,11 @@ html, body { padding: 0; margin: 0; background:url(https://www.foodiesfeed.com/wp-content/uploads/2015/05/homemade-bun-with-tea-and-a-book.jpg) no-repeat center center fixed; - } +* { + text-align: center; +} body { background:rgba(255,255,255,0.5); /* applies a 50% transparent white background */ @@ -16,7 +18,6 @@ body { font-family: 'Gudea', sans-serif; color: black; text-align: center; - } @@ -65,6 +66,7 @@ body { letter-spacing: 1px; text-indent: 5%; border-radius: 5px 0 0 5px; + text-align: left; } diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 94372eaf7..f058dd5e4 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -7,12 +7,13 @@ - + <%= content_for?(:title) ? yield(:title) : "YUM MUNCHER" %> <% unless controller_name=="recipe" && action_name=='new' %> <%= stylesheet_link_tag "application" %> <%= javascript_include_tag "application", 'data-turbolinks-track' => true %> <%= csrf_meta_tags %> +
diff --git a/app/views/recipe/new.html.erb b/app/views/recipe/new.html.erb index 9eaba1a24..5a4e7b5f4 100644 --- a/app/views/recipe/new.html.erb +++ b/app/views/recipe/new.html.erb @@ -17,4 +17,5 @@ <% end %> +

diff --git a/app/views/recipe/show.html.erb b/app/views/recipe/show.html.erb index 7540facea..de5ab1e09 100644 --- a/app/views/recipe/show.html.erb +++ b/app/views/recipe/show.html.erb @@ -40,5 +40,5 @@
- +

From 3ac93c37ee1613b44b53f686c1d13a1bdaaaa370 Mon Sep 17 00:00:00 2001 From: Steffany Brown Date: Mon, 7 May 2018 11:44:58 -0700 Subject: [PATCH 11/12] updated pagination style --- app/assets/stylesheets/application.css | 3 +- app/assets/stylesheets/main_search.css | 22 +++++++++----- app/assets/stylesheets/results.css | 40 +++++++++++++++++++++++++- app/views/layouts/application.html.erb | 1 + app/views/recipe/index.html.erb | 4 ++- app/views/recipe/new.html.erb | 38 ++++++++++++------------ 6 files changed, 79 insertions(+), 29 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index a6bb650b5..f0782aeb5 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -71,7 +71,8 @@ nav { width: 30%; height: 46px; background: #6E7B8B; - font-family: inherit; + font-family: 'Gudea'; + font-size: 14px; font-weight: bold; color: inherit; letter-spacing: 1px; diff --git a/app/assets/stylesheets/main_search.css b/app/assets/stylesheets/main_search.css index abff144a8..de28dfbd0 100644 --- a/app/assets/stylesheets/main_search.css +++ b/app/assets/stylesheets/main_search.css @@ -1,5 +1,5 @@ html, body { - height:55%; + padding: 0; margin: 0; background:url(https://www.foodiesfeed.com/wp-content/uploads/2015/05/homemade-bun-with-tea-and-a-book.jpg) no-repeat center center fixed; @@ -9,21 +9,29 @@ html, body { text-align: center; } -body { - background:rgba(255,255,255,0.5); /* applies a 50% transparent white background */ -} - .search_container { font-family: 'Gudea', sans-serif; color: black; text-align: center; + display: flex; + justify-content: center; + margin-top: 100px; + height:25%; + background:rgba(255,255,255,0.5); /* applies a 50% transparent white background */ + padding-bottom: 50px; + +} + +footer { + background: none; } .search_container form { width: 450px; - margin: 17% auto; + /* margin: 17% auto; */ + flex: 0, 2, auto } @@ -66,7 +74,7 @@ body { letter-spacing: 1px; text-indent: 5%; border-radius: 5px 0 0 5px; - text-align: left; + text-align: left; } diff --git a/app/assets/stylesheets/results.css b/app/assets/stylesheets/results.css index 8b3a5e94a..33e849d56 100644 --- a/app/assets/stylesheets/results.css +++ b/app/assets/stylesheets/results.css @@ -50,7 +50,8 @@ main { position: absolute; overflow: hidden; top: 0; - left: 0; } + left: 0; + font-family: 'Gudea'} .overlay-fade-in p { letter-spacing: 0.15em; @@ -100,3 +101,40 @@ main { .overlay-fade-in:hover .button { transition-delay: 0.2s; } + + +.pagination { + font-family: 'Do Hyeon'; + font-size: 22px; + text-decoration: none; + color: black; +} + +.pagination > * { + margin-right: 0.1em; + padding: 0.3em 0.4em; +} + +.pagination a { + text-decoration: none; + color: black; +} + +.pagination a:hover { + text-decoration: none; + color: black; +} + +.pagination a:active { + text-shadow: none; + text-decoration: none; + color: black; + +} + +.pagination .current { + text-decoration: underline; + color: black; + font-size: none; + font-size: 26px +} diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index f058dd5e4..35c9afdac 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,6 +1,7 @@ + diff --git a/app/views/recipe/index.html.erb b/app/views/recipe/index.html.erb index 77d558895..86740a71e 100644 --- a/app/views/recipe/index.html.erb +++ b/app/views/recipe/index.html.erb @@ -16,7 +16,9 @@ <% end %>
- <%= will_paginate @recipes, class: "row" %> +

diff --git a/app/views/recipe/new.html.erb b/app/views/recipe/new.html.erb index 5a4e7b5f4..f0f4d538d 100644 --- a/app/views/recipe/new.html.erb +++ b/app/views/recipe/new.html.erb @@ -1,21 +1,21 @@ - - -<%= stylesheet_link_tag "main_search" %> -
- <%= form_tag results_path, method: "get" do %> -
-

YUM MUNCHER

-
-
-

What would you like to cook?

-
-
- <%= text_field_tag(:query, nil, class: "button", id: "input") %> - <%= submit_tag("Get Recipes", class: "button", id: "submit") %> -
- <% end %> -
- + + <%= stylesheet_link_tag "main_search" %> + +
+ <%= form_tag results_path, method: "get" do %> +
+

YUM MUNCHER

+
+
+

What would you like to cook?

+
+
+ <%= text_field_tag(:query, nil, class: "button", id: "input") %> + <%= submit_tag("Get Recipes", class: "button", id: "submit") %> +
+ <% end %> +
+ +

- From 0d0bdd71eb8861f273b0aeb1079ac2c9612e4df2 Mon Sep 17 00:00:00 2001 From: Steffany Brown Date: Mon, 7 May 2018 11:55:40 -0700 Subject: [PATCH 12/12] updated main search css --- app/assets/stylesheets/application.css | 6 +++--- app/assets/stylesheets/main_search.css | 4 +++- app/assets/stylesheets/recipe_show.css | 8 ++++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index f0782aeb5..1918c734e 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -15,9 +15,7 @@ nav { justify-content: space-between; align-items: center; align-content: space-around; - width: 80%; - padding-left: 30px; - padding-right: 30px; + width: 100%; padding-top: 20px; padding-bottom: 20px; @@ -27,6 +25,7 @@ nav { .results-header h1 { font-family: 'Do Hyeon'; font-size: 40px; + padding-left: 175px; } .results-header h1 a { @@ -37,6 +36,7 @@ nav { .search_container form { width: 300px; + padding-right: 175px; } .search_container .input-container { diff --git a/app/assets/stylesheets/main_search.css b/app/assets/stylesheets/main_search.css index de28dfbd0..2b9350655 100644 --- a/app/assets/stylesheets/main_search.css +++ b/app/assets/stylesheets/main_search.css @@ -31,7 +31,8 @@ footer { .search_container form { width: 450px; /* margin: 17% auto; */ - flex: 0, 2, auto + flex: 0, 2, auto; + justify-content: center; } @@ -83,6 +84,7 @@ footer { height: 46px; background: #6E7B8B; font-family: inherit; + font-size: 16px; font-weight: bold; color: inherit; letter-spacing: 1px; diff --git a/app/assets/stylesheets/recipe_show.css b/app/assets/stylesheets/recipe_show.css index 0916c4989..b84799be7 100644 --- a/app/assets/stylesheets/recipe_show.css +++ b/app/assets/stylesheets/recipe_show.css @@ -12,7 +12,6 @@ main { flex-flow: column; justify-content: center; align-items: center; - } .show-container { @@ -23,11 +22,12 @@ main { justify-content: space-evenly; align-items: center; align-content: space-around; - width: 80%; + width: 100%; padding-left: 30px; padding-right: 30px; padding-top: 20px; padding-bottom: 20px; + flex: 0, 2, auto } @@ -59,3 +59,7 @@ h2 { font-family: 'Do Hyeon'; font-size: 40px; } + +img { + border-radius: 8px; +}