From 63cab2d83220afbe67f0b2501b9e237f8b4fda0d Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Fri, 2 Nov 2018 15:38:53 -0700 Subject: [PATCH 1/9] uhhh sorry about that... --- .gitignore | 28 ++ .ruby-version | 1 + Gemfile | 86 +++++ Gemfile.lock | 305 ++++++++++++++++++ Guardfile | 9 + Rakefile | 6 + app/assets/config/manifest.js | 3 + app/assets/images/.keep | 0 app/assets/javascripts/application.js | 20 ++ app/assets/javascripts/cable.js | 13 + app/assets/javascripts/channels/.keep | 0 app/assets/javascripts/pages.js | 2 + app/assets/stylesheets/application.scss | 18 ++ app/assets/stylesheets/pages.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/pages_controller.rb | 30 ++ app/helpers/application_helper.rb | 2 + app/helpers/pages_helper.rb | 102 ++++++ 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 | 15 + app/views/layouts/mailer.html.erb | 13 + app/views/layouts/mailer.text.erb | 1 + app/views/pages/home.html.erb | 7 + app/views/pages/recipe.html.erb | 14 + app/views/pages/search.html.erb | 26 ++ 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 | 26 ++ 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 +++ config/initializers/action_view.rb | 1 + .../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 + config/initializers/wrap_parameters.rb | 14 + config/locales/en.yml | 33 ++ config/puma.rb | 34 ++ config/routes.rb | 10 + config/spring.rb | 6 + config/storage.yml | 34 ++ db/seeds.rb | 7 + lib/assets/.keep | 0 lib/edamam_wrapper.rb | 59 ++++ 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 + storage/.keep | 0 test/application_system_test_case.rb | 5 + test/controllers/.keep | 0 test/controllers/pages_controller_test.rb | 7 + 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 | 24 ++ tmp/.keep | 0 vendor/.keep | 0 91 files changed, 1713 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile 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/pages.js create mode 100644 app/assets/stylesheets/application.scss create mode 100644 app/assets/stylesheets/pages.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/pages_controller.rb create mode 100644 app/helpers/application_helper.rb create mode 100644 app/helpers/pages_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/pages/home.html.erb create mode 100644 app/views/pages/recipe.html.erb create mode 100644 app/views/pages/search.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/action_view.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/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/seeds.rb create mode 100644 lib/assets/.keep create mode 100644 lib/edamam_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 storage/.keep create mode 100644 test/application_system_test_case.rb create mode 100644 test/controllers/.keep create mode 100644 test/controllers/pages_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..be342dfab --- /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/* +!/storage/.keep + +/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..25c81fe39 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-2.5.1 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..79a64131b --- /dev/null +++ b/Gemfile @@ -0,0 +1,86 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.5.1' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.1' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.11' +# Use SCSS for stylesheets +gem 'sass-rails', '~> 5.0' +# Use Uglifier as compressor for JavaScript assets +gem 'uglifier', '>= 1.3.0' +# See https://github.com/rails/execjs#readme for more supported runtimes +# gem 'mini_racer', platforms: :ruby + +# Use CoffeeScript for .coffee assets and views +# gem 'coffee-rails', '~> 4.2' +# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks +gem 'turbolinks', '~> 5' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.1.0', require: false + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] + gem 'minitest-vcr' + gem 'webmock' + gem 'dotenv-rails' +end + +group :development do + # Access an interactive console on exception pages or by calling 'console' anywhere in the code. + gem 'web-console', '>= 3.3.0' + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +group :test do + # Adds support for Capybara system testing and selenium driver + gem 'capybara', '>= 2.15' + gem 'selenium-webdriver' + # Easy installation and use of chromedriver to run system tests with Chrome + gem 'chromedriver-helper' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +gem 'jquery-rails' +gem 'jquery-turbolinks' +gem 'bootstrap', '~> 4.1.3' +group :development, :test do + gem 'pry-rails' +end + +group :development do + gem 'better_errors' + gem 'binding_of_caller' + gem 'guard' + gem 'guard-minitest' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end + +gem 'httparty' diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..ab2ee789d --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,305 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.1) + actionpack (= 5.2.1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.1) + actionpack (= 5.2.1) + actionview (= 5.2.1) + activejob (= 5.2.1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.1) + actionview (= 5.2.1) + activesupport (= 5.2.1) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.1) + activesupport (= 5.2.1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.1) + activesupport (= 5.2.1) + globalid (>= 0.3.6) + activemodel (5.2.1) + activesupport (= 5.2.1) + activerecord (5.2.1) + activemodel (= 5.2.1) + activesupport (= 5.2.1) + arel (>= 9.0) + activestorage (5.2.1) + actionpack (= 5.2.1) + activerecord (= 5.2.1) + marcel (~> 0.3.1) + activesupport (5.2.1) + 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) + autoprefixer-rails (9.3.1) + execjs + better_errors (2.5.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.2) + msgpack (~> 1.0) + bootstrap (4.1.3) + autoprefixer-rails (>= 6.0.3) + popper_js (>= 1.12.9, < 2) + sass (>= 3.5.2) + builder (3.2.3) + byebug (10.0.2) + capybara (3.10.0) + addressable + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.2) + xpath (~> 3.2) + childprocess (0.9.0) + ffi (~> 1.0, >= 1.0.11) + chromedriver-helper (2.1.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.5.0) + dotenv-rails (2.5.0) + dotenv (= 2.5.0) + railties (>= 3.2, < 6.0) + erubi (1.7.1) + execjs (2.7.0) + ffi (1.9.25) + formatador (0.2.5) + globalid (0.4.1) + activesupport (>= 4.2.0) + guard (2.14.2) + formatador (>= 0.2.4) + listen (>= 2.7, < 4.0) + lumberjack (>= 1.0.12, < 2.0) + nenv (~> 0.1) + notiffany (~> 0.0) + pry (>= 0.9.12) + shellany (~> 0.0) + thor (>= 0.18.1) + guard-compat (1.2.1) + guard-minitest (2.4.6) + guard-compat (~> 1.2) + minitest (>= 3.0) + hashdiff (0.3.7) + httparty (0.16.2) + multi_xml (>= 0.5.2) + i18n (1.1.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.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + lumberjack (1.0.13) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.0) + mimemagic (0.3.2) + mini_mime (1.0.1) + 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.3.5) + 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) + nenv (0.3.0) + nio4r (2.3.1) + nokogiri (1.8.5) + mini_portile2 (~> 2.3.0) + notiffany (0.1.1) + nenv (~> 0.1) + shellany (~> 0.0) + pg (1.1.3) + popper_js (1.14.3) + 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.3) + puma (3.12.0) + rack (2.0.5) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.1) + actioncable (= 5.2.1) + actionmailer (= 5.2.1) + actionpack (= 5.2.1) + actionview (= 5.2.1) + activejob (= 5.2.1) + activemodel (= 5.2.1) + activerecord (= 5.2.1) + activestorage (= 5.2.1) + activesupport (= 5.2.1) + bundler (>= 1.3.0) + railties (= 5.2.1) + 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.1) + actionpack (= 5.2.1) + activesupport (= 5.2.1) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.1) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + regexp_parser (1.2.0) + ruby-progressbar (1.10.0) + ruby_dep (1.5.0) + rubyzip (1.2.2) + safe_yaml (1.0.4) + sass (3.6.0) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + 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.14.1) + childprocess (~> 0.5) + rubyzip (~> 1.2, >= 1.2.2) + shellany (0.0.1) + 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.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + 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.2.0) + turbolinks-source (~> 5.2) + turbolinks-source (5.2.0) + tzinfo (1.2.5) + thread_safe (~> 0.1) + uglifier (4.1.19) + execjs (>= 0.3.0, < 3) + vcr (4.0.0) + web-console (3.7.0) + actionview (>= 5.0) + activemodel (>= 5.0) + bindex (>= 0.4.0) + railties (>= 5.0) + webmock (3.4.2) + addressable (>= 2.3.6) + crack (>= 0.3.2) + hashdiff + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + xpath (3.2.0) + nokogiri (~> 1.8) + +PLATFORMS + ruby + +DEPENDENCIES + better_errors + binding_of_caller + bootsnap (>= 1.1.0) + bootstrap (~> 4.1.3) + byebug + capybara (>= 2.15) + chromedriver-helper + dotenv-rails + guard + guard-minitest + httparty + jbuilder (~> 2.5) + jquery-rails + jquery-turbolinks + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + minitest-vcr + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.1) + 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 + +RUBY VERSION + ruby 2.5.1p57 + +BUNDLED WITH + 1.16.2 diff --git a/Guardfile b/Guardfile new file mode 100644 index 000000000..e34f706f4 --- /dev/null +++ b/Guardfile @@ -0,0 +1,9 @@ +guard :minitest, autorun: false, spring: true do + watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' } + watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" } + watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" } + watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" } + watch(%r{^test/.+_test.rb$}) + watch(%r{^test/test_helper.rb$}) { 'test' } +end 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..4f73c21a7 --- /dev/null +++ b/app/assets/javascripts/application.js @@ -0,0 +1,20 @@ +// 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 jquery3 + //= require popper + //= require bootstrap-sprockets + +// +//= require rails-ujs +//= require activestorage +//= require turbolinks +//= require_tree . 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/pages.js b/app/assets/javascripts/pages.js new file mode 100644 index 000000000..dee720fac --- /dev/null +++ b/app/assets/javascripts/pages.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/application.scss b/app/assets/stylesheets/application.scss new file mode 100644 index 000000000..8b1701e58 --- /dev/null +++ b/app/assets/stylesheets/application.scss @@ -0,0 +1,18 @@ +/* + * 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. + * + */ + +/* Custom bootstrap variables must be set or imported *before* bootstrap. */ +@import "bootstrap"; +/* Import scss content */ +@import "**/*"; diff --git a/app/assets/stylesheets/pages.scss b/app/assets/stylesheets/pages.scss new file mode 100644 index 000000000..0d6878aa1 --- /dev/null +++ b/app/assets/stylesheets/pages.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the pages 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/pages_controller.rb b/app/controllers/pages_controller.rb new file mode 100644 index 000000000..42f8e8122 --- /dev/null +++ b/app/controllers/pages_controller.rb @@ -0,0 +1,30 @@ +class PagesController < ApplicationController + def home + end + + def search + if params[:queery] + session[:queery] = params[:queery] + end + + if params[:page] + session[:page] = params[:page].to_i + else + session[:page] = 1 + end + puts session[:queery] + + @recipes = EdamamWrapper.search(session[:queery], session[:page]) + end + + def recipe + if params[:title] + if params[:url] + session[:recipe] = params + else + session[:recipe] = EdamamWrapper.recipe(params[:title]) + end + end + @recipe = session[:recipe] + 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/pages_helper.rb b/app/helpers/pages_helper.rb new file mode 100644 index 000000000..45df844a8 --- /dev/null +++ b/app/helpers/pages_helper.rb @@ -0,0 +1,102 @@ +module PagesHelper + def paginator(page, recipes) + output = [] + if page > 1 + output << (link_to "previous page ", search_path(:page=> (session[:page] - 1))) + else + output << "previous page " + end + output << "#{session[:page]} " + if recipes.length == 10 + output << (link_to "next page", search_path(:page=> (session[:page] + 1))) + else + output << "next page" + end + + return output.join.html_safe + end + + # def paginator(page, recipes) + # if page == 1 + # if recipes.length % 10 == 0 + # pages = (recipes.length / 10) - 1 + # else + # pages = (recipes.length / 10) + # end + # + # if pages >= 1 + # output = ["previous page "] + # else + # output = [] + # end + # output << "#{session[:page]} " + # pages.times do |i| + # output << (link_to "#{session[:page] + i + 1} ", search_path(:page=> (session[:page] + i + 1))) + # end + # if pages >= 1 + # output << (link_to " next page", search_path(:page=> (session[:page] + 1))) + # end + # + # return output.join.html_safe + # elsif page == 2 + # if recipes.length % 10 == 0 + # pages = (recipes.length / 10) - 2 + # else + # pages = (recipes.length / 10) - 1 + # end + # + # output = [ + # (link_to "previous page ", search_path(:page=> (session[:page] - 1))), + # (link_to "1 ", search_path(:page=> 1)), + # "2 " + # ] + # pages.times do |i| + # output << (link_to "#{session[:page] + i + 1} ", search_path(:page=> (session[:page] + i + 1))) + # end + # + # if pages >= 1 + # output << (link_to " next page", search_path(:page=> (session[:page] + 1))) + # end + # return output.join.html_safe + # else + # if recipes.length % 10 == 0 + # pages = (recipes.length / 10) - 3 + # else + # pages = (recipes.length / 10) - 2 + # end + # + # output = [ + # (link_to "previous page ", search_path(:page=> (session[:page] - 1))), + # (link_to "#{session[:page] - 2} ", search_path(:page=> (session[:page] - 2))), + # (link_to "#{session[:page] - 1} ", search_path(:page=> (session[:page] - 1))), + # "#{session[:page]} " + # ] + # pages.times do |i| + # output << (link_to "#{session[:page] + i + 1} ", search_path(:page=> (session[:page] + i + 1))) + # end + # + # if pages >= 1 + # output << (link_to " next page", search_path(:page=> (session[:page] + 1))) + # end + # + # return output.join.html_safe + # # return [(link_to "previous page ", search_path(:page=> (session[:page] - 1))), + # # (link_to "#{session[:page] - 2} ", search_path(:page=> (session[:page] - 2))), + # # (link_to "#{session[:page] - 1} ", search_path(:page=> (session[:page] - 1))), + # # "#{session[:page]} ", + # # (link_to "#{session[:page] + 1} ", search_path(:page=> (session[:page] + 1))), + # # (link_to "#{session[:page] + 2} ", search_path(:page=> (session[:page] + 2))), + # # (link_to "next page", search_path(:page =>(session[:page] + 1)))].join.html_safe + # end + # end + + def reformat_array(strung_arr) + if strung_arr.class == Array + return strung_arr + else + strung_arr = strung_arr[1..-2] + strung_arr = strung_arr.split("\"") + return strung_arr.reject!.with_index{|item, i| i.even?} + end + end +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..f2e0d8faa --- /dev/null +++ b/app/views/layouts/application.html.erb @@ -0,0 +1,15 @@ + + + + ApiMuncher + <%= csrf_meta_tags %> + <%= csp_meta_tag %> + + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> + <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + + + + <%= 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/pages/home.html.erb b/app/views/pages/home.html.erb new file mode 100644 index 000000000..aa29b7f09 --- /dev/null +++ b/app/views/pages/home.html.erb @@ -0,0 +1,7 @@ +

Food.

+ +<%= form_tag search_path do %> + <%= label_tag(:queery, "Ingredient?") %> + <%= text_field_tag(:queery) %> + <%= submit_tag("Explore") %> +<% end %> diff --git a/app/views/pages/recipe.html.erb b/app/views/pages/recipe.html.erb new file mode 100644 index 000000000..93ef87e16 --- /dev/null +++ b/app/views/pages/recipe.html.erb @@ -0,0 +1,14 @@ + diff --git a/app/views/pages/search.html.erb b/app/views/pages/search.html.erb new file mode 100644 index 000000000..20e4bcfa2 --- /dev/null +++ b/app/views/pages/search.html.erb @@ -0,0 +1,26 @@ +<%= paginator(session[:page], @recipes) %> + +<% if @recipes[0].url == nil %> +

<%= @recipes[0].title %>

+<% else %> + <% @recipes.each do |recipe| %> + + <% end %> +<% end %> 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..e2e4c5f58 --- /dev/null +++ b/config/application.rb @@ -0,0 +1,26 @@ +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..ab6360602 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +52iPJVRnCsHaujGMfs2jHfd8ld/+Oj2R32inERHlogfTXXDJjDHdOsBgKymIyJOLSB91UMPOkugjXD29Ju0SL2nhO7Uv2HEcv0vRHFJJUTvQx0zLtPyOG7DqJlmEOvwDsjG0++hEuyQ7pDUsO6n4SDz7IS32mnd9rm5isbtfGIvrBIzlfG1MuSyHJQB5OrTSfn9A2SC/EQXMWrXaUcvZboPdLMroASHSiw/drdd5efRwMB09NhPQYgLMLWnkMf0xzMUuvJdI0zxCRaV9EhJ8EaELetg06Hx0/GEKzEkMKpqxV/uobzyFmiQgabg0LKAzf+/HidH2/J0BLvIEltGfCsRKYa+NOBlND2Nraw+s8tuu1GvHXC36f7XgEDhfnaU9sK1S8t+jJn/rpVvpe9AqWl0cC/jEt56MgU02--r7UWUW4wWPY7sBlv--44XVkHebP1/RwzYjywIAvw== \ 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/action_view.rb b/config/initializers/action_view.rb new file mode 100644 index 000000000..142d382f8 --- /dev/null +++ b/config/initializers/action_view.rb @@ -0,0 +1 @@ +Rails.application.config.action_view.form_with_generates_remote_forms = false 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/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..9958c107a --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,10 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + root 'pages#home' + post 'search', to: 'pages#search', as: 'search' + get 'search/:queery', to: 'pages#search' + post 'recipe', to: 'pages#recipe', as: 'recipe' + get 'recipe/:title', to: 'pages#recipe' + get 'search', to: 'pages#search', as: 'search_get' + get 'recipe', to: 'pages#recipe', as: 'recipe_get' +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/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_wrapper.rb b/lib/edamam_wrapper.rb new file mode 100644 index 000000000..13088886f --- /dev/null +++ b/lib/edamam_wrapper.rb @@ -0,0 +1,59 @@ +require 'httparty' +require 'recipe' + +class EdamamWrapper + BASE_URL = "https://api.edamam.com/search?" + ID = ENV["EDAMAM_ID"] + KEY = ENV["EDAMAM_KEY"] + + def self.search(queery, page = nil) + url = BASE_URL + "app_id=#{ID}&" + "app_key=#{KEY}&" + "q=#{queery}" + if page + from = (page * 10) - 10 + to = from + 10 + data = HTTParty.get(url + "&from=#{from}&to=#{to}") + else + data = HTTParty.get(url) + end + + if data["hits"] != [] + return recipe_squeezer(data["hits"]) + elsif page > 1 && data["hits"] == [] + puts "elsif" + return recipe_squeezer([{"recipe"=> {"label"=> "looks like there are no further results for this search!"}}]) + else + puts "else" + return recipe_squeezer([{"recipe"=> {"label"=> "looks like there were no results for this search"}}]) + end + end + + private + + def self.recipe_squeezer(hits) + squeezed_recipes = [] + hits.each do |hash| + squeezed_recipes << Recipe.new(hash["recipe"]) + end + + return squeezed_recipes + end + + def self.recipe(title) + url = BASE_URL + "app_id=#{ID}&" + "app_key=#{KEY}&" + "q=#{title}" + data = HTTParty.get(url) + if data["hits"] + recipe = recipe_squeezer(data["hits"]).first + end + + return { + "title"=> recipe.title, + "image"=> recipe.image, + "url"=> recipe.url, + "source"=> recipe.source, + "health_labels"=> recipe.health_labels, + "diet_labels"=> recipe.diet_labels, + "calories"=> recipe.calories, + "ingredients"=> recipe.ingredients + } + end +end diff --git a/lib/recipe.rb b/lib/recipe.rb new file mode 100644 index 000000000..17e45a650 --- /dev/null +++ b/lib/recipe.rb @@ -0,0 +1,14 @@ +class Recipe + attr_reader :title, :image, :ingredients, :url, :source, :diet_labels, :health_labels, :calories + + def initialize(recipe_hash) + @title = recipe_hash["label"] + @image = recipe_hash["image"] + @ingredients = recipe_hash["ingredientLines"] + @url = recipe_hash["url"] + @source = recipe_hash["source"] + @diet_labels = recipe_hash["dietLabels"] + @health_labels = recipe_hash["healthLabels"] + @calories = recipe_hash["calories"] + 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/storage/.keep b/storage/.keep new file mode 100644 index 000000000..e69de29bb 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/pages_controller_test.rb b/test/controllers/pages_controller_test.rb new file mode 100644 index 000000000..c9a686b8f --- /dev/null +++ b/test/controllers/pages_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe PagesController do + # it "must be a real test" do + # flunk "Need real tests" + # 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..2b5172a7d --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,24 @@ +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 83a0a317c2452db062cfee8a4e30dd27ba7caa1a Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Sun, 4 Nov 2018 12:08:11 -0800 Subject: [PATCH 2/9] setup google oauth --- Gemfile | 2 ++ Gemfile.lock | 23 +++++++++++++ app/assets/javascripts/sessions.js | 2 ++ app/assets/stylesheets/sessions.scss | 3 ++ app/controllers/application_controller.rb | 5 +++ app/controllers/pages_controller.rb | 2 ++ app/controllers/sessions_controller.rb | 12 +++++++ app/helpers/sessions_helper.rb | 2 ++ app/models/search.rb | 2 ++ app/models/user.rb | 10 ++++++ app/views/layouts/application.html.erb | 6 ++++ app/views/pages/home.html.erb | 8 ++++- app/views/sessions/create.html.erb | 2 ++ app/views/sessions/destroy.html.erb | 2 ++ config/initializers/omniauth.rb | 5 +++ config/routes.rb | 7 ++++ db/migrate/20181102224338_create_searches.rb | 9 +++++ db/migrate/20181102224459_create_users.rb | 12 +++++++ .../20181104195026_change_uid_to_bigint.rb | 5 +++ .../20181104195531_change_uid_to_string.rb | 5 +++ ...4200750_change_favorites_column_default.rb | 4 +++ db/schema.rb | 33 +++++++++++++++++++ test/controllers/sessions_controller_test.rb | 7 ++++ test/fixtures/searches.yml | 7 ++++ test/fixtures/users.yml | 7 ++++ test/models/search_test.rb | 9 +++++ test/models/user_test.rb | 9 +++++ 27 files changed, 199 insertions(+), 1 deletion(-) create mode 100644 app/assets/javascripts/sessions.js create mode 100644 app/assets/stylesheets/sessions.scss create mode 100644 app/controllers/sessions_controller.rb create mode 100644 app/helpers/sessions_helper.rb create mode 100644 app/models/search.rb create mode 100644 app/models/user.rb create mode 100644 app/views/sessions/create.html.erb create mode 100644 app/views/sessions/destroy.html.erb create mode 100644 config/initializers/omniauth.rb create mode 100644 db/migrate/20181102224338_create_searches.rb create mode 100644 db/migrate/20181102224459_create_users.rb create mode 100644 db/migrate/20181104195026_change_uid_to_bigint.rb create mode 100644 db/migrate/20181104195531_change_uid_to_string.rb create mode 100644 db/migrate/20181104200750_change_favorites_column_default.rb create mode 100644 db/schema.rb create mode 100644 test/controllers/sessions_controller_test.rb create mode 100644 test/fixtures/searches.yml create mode 100644 test/fixtures/users.yml create mode 100644 test/models/search_test.rb create mode 100644 test/models/user_test.rb diff --git a/Gemfile b/Gemfile index 79a64131b..d8552549e 100644 --- a/Gemfile +++ b/Gemfile @@ -84,3 +84,5 @@ group :test do end gem 'httparty' +gem 'omniauth' +gem 'omniauth-google-oauth2' diff --git a/Gemfile.lock b/Gemfile.lock index ab2ee789d..0024b23ee 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -90,6 +90,8 @@ GEM railties (>= 3.2, < 6.0) erubi (1.7.1) execjs (2.7.0) + faraday (0.15.3) + multipart-post (>= 1.2, < 3) ffi (1.9.25) formatador (0.2.5) globalid (0.4.1) @@ -108,6 +110,7 @@ GEM guard-compat (~> 1.2) minitest (>= 3.0) hashdiff (0.3.7) + hashie (3.5.7) httparty (0.16.2) multi_xml (>= 0.5.2) i18n (1.1.1) @@ -123,6 +126,7 @@ GEM jquery-turbolinks (2.1.0) railties (>= 3.1.0) turbolinks + jwt (2.1.0) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -157,6 +161,7 @@ GEM msgpack (1.2.4) multi_json (1.13.1) multi_xml (0.6.0) + multipart-post (2.0.0) nenv (0.3.0) nio4r (2.3.1) nokogiri (1.8.5) @@ -164,6 +169,22 @@ GEM notiffany (0.1.1) nenv (~> 0.1) shellany (~> 0.0) + oauth2 (1.4.1) + faraday (>= 0.8, < 0.16.0) + jwt (>= 1.0, < 3.0) + multi_json (~> 1.3) + multi_xml (~> 0.5) + rack (>= 1.2, < 3) + omniauth (1.8.1) + hashie (>= 3.4.6, < 3.6.0) + rack (>= 1.6.2, < 3) + omniauth-google-oauth2 (0.5.3) + jwt (>= 1.5) + omniauth (>= 1.1.1) + omniauth-oauth2 (>= 1.5) + omniauth-oauth2 (1.5.0) + oauth2 (~> 1.1) + omniauth (~> 1.2) pg (1.1.3) popper_js (1.14.3) pry (0.11.3) @@ -284,6 +305,8 @@ DEPENDENCIES minitest-rails minitest-reporters minitest-vcr + omniauth + omniauth-google-oauth2 pg (>= 0.18, < 2.0) pry-rails puma (~> 3.11) diff --git a/app/assets/javascripts/sessions.js b/app/assets/javascripts/sessions.js new file mode 100644 index 000000000..dee720fac --- /dev/null +++ b/app/assets/javascripts/sessions.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/sessions.scss b/app/assets/stylesheets/sessions.scss new file mode 100644 index 000000000..7bef9cf82 --- /dev/null +++ b/app/assets/stylesheets/sessions.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the sessions controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 09705d12a..f651464d6 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,2 +1,7 @@ class ApplicationController < ActionController::Base + before_action :current_user + + def current_user + @current_user ||= User.find(session[:user_id]) if session[:user_id] + end end diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index 42f8e8122..a8d966213 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -1,10 +1,12 @@ class PagesController < ApplicationController def home + @recent_searches = Search.limit(10).reverse_order end def search if params[:queery] session[:queery] = params[:queery] + Search.create(queery: params[:queery]) end if params[:page] diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb new file mode 100644 index 000000000..3e095643c --- /dev/null +++ b/app/controllers/sessions_controller.rb @@ -0,0 +1,12 @@ +class SessionsController < ApplicationController + def create + user = User.from_omniauth(request.env["omniauth.auth"]) + session[:user_id] = user.id + redirect_to root_path + end + + def destroy + session[:user_id] = nil + redirect_to root_path + end +end diff --git a/app/helpers/sessions_helper.rb b/app/helpers/sessions_helper.rb new file mode 100644 index 000000000..309f8b2eb --- /dev/null +++ b/app/helpers/sessions_helper.rb @@ -0,0 +1,2 @@ +module SessionsHelper +end diff --git a/app/models/search.rb b/app/models/search.rb new file mode 100644 index 000000000..344d9bf7e --- /dev/null +++ b/app/models/search.rb @@ -0,0 +1,2 @@ +class Search < ApplicationRecord +end diff --git a/app/models/user.rb b/app/models/user.rb new file mode 100644 index 000000000..62420cfc8 --- /dev/null +++ b/app/models/user.rb @@ -0,0 +1,10 @@ +class User < ApplicationRecord + def self.from_omniauth(auth) + where(provider: auth.provider, uid: auth.uid).first_or_initialize.tap do |user| + user.provider = auth.provider + user.uid = auth.uid + user.username = auth.info.name + user.save! + end + end +end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index f2e0d8faa..c2d6f3798 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -10,6 +10,12 @@ + <% if @current_user %> + Signed in as <%= @current_user.username %>! + <%= link_to "Sign out", logout_path, id: "sign_out" %> + <% else %> + <%= link_to "Sign in with Google", "/auth/google_oauth2", id: "sign_in" %> + <% end %> <%= yield %> diff --git a/app/views/pages/home.html.erb b/app/views/pages/home.html.erb index aa29b7f09..35cf810c9 100644 --- a/app/views/pages/home.html.erb +++ b/app/views/pages/home.html.erb @@ -1,7 +1,13 @@

Food.

- <%= form_tag search_path do %> <%= label_tag(:queery, "Ingredient?") %> <%= text_field_tag(:queery) %> <%= submit_tag("Explore") %> <% end %> + +

most recent searches:

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

Sessions#create

+

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

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

Sessions#destroy

+

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

diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb new file mode 100644 index 000000000..a882e7e97 --- /dev/null +++ b/config/initializers/omniauth.rb @@ -0,0 +1,5 @@ +OmniAuth.config.logger = Rails.logger + +Rails.application.config.middleware.use OmniAuth::Builder do + provider :google_oauth2, ENV["GOOGLE_ID"], ENV["GOOGLE_KEY"], {client_options: {ssl: {ca_file: Rails.root.join("cacert.pem").to_s}}} +end diff --git a/config/routes.rb b/config/routes.rb index 9958c107a..45bcf6ddf 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,6 @@ Rails.application.routes.draw do + get 'sessions/create' + get 'sessions/destroy' # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html root 'pages#home' post 'search', to: 'pages#search', as: 'search' @@ -7,4 +9,9 @@ get 'recipe/:title', to: 'pages#recipe' get 'search', to: 'pages#search', as: 'search_get' get 'recipe', to: 'pages#recipe', as: 'recipe_get' + get 'auth/:provider/callback', to: 'sessions#create' + get 'auth/failure', to: redirect('/') + get 'logout', to: 'sessions#destroy', as: 'logout' + + resources :sessions, only: [:create, :destroy] end diff --git a/db/migrate/20181102224338_create_searches.rb b/db/migrate/20181102224338_create_searches.rb new file mode 100644 index 000000000..4d10100d9 --- /dev/null +++ b/db/migrate/20181102224338_create_searches.rb @@ -0,0 +1,9 @@ +class CreateSearches < ActiveRecord::Migration[5.2] + def change + create_table :searches do |t| + t.string :queery + + t.timestamps + end + end +end diff --git a/db/migrate/20181102224459_create_users.rb b/db/migrate/20181102224459_create_users.rb new file mode 100644 index 000000000..f7d9b2f0e --- /dev/null +++ b/db/migrate/20181102224459_create_users.rb @@ -0,0 +1,12 @@ +class CreateUsers < ActiveRecord::Migration[5.2] + def change + create_table :users do |t| + t.string :username + t.integer :uid, null: false + t.string :provider, null: false + t.string :favorites, array: true + + t.timestamps + end + end +end diff --git a/db/migrate/20181104195026_change_uid_to_bigint.rb b/db/migrate/20181104195026_change_uid_to_bigint.rb new file mode 100644 index 000000000..60e88f1af --- /dev/null +++ b/db/migrate/20181104195026_change_uid_to_bigint.rb @@ -0,0 +1,5 @@ +class ChangeUidToBigint < ActiveRecord::Migration[5.2] + def change + change_column :users, :uid, :bigint + end +end diff --git a/db/migrate/20181104195531_change_uid_to_string.rb b/db/migrate/20181104195531_change_uid_to_string.rb new file mode 100644 index 000000000..87cac40e9 --- /dev/null +++ b/db/migrate/20181104195531_change_uid_to_string.rb @@ -0,0 +1,5 @@ +class ChangeUidToString < ActiveRecord::Migration[5.2] + def change + change_column :users, :uid, :string + end +end diff --git a/db/migrate/20181104200750_change_favorites_column_default.rb b/db/migrate/20181104200750_change_favorites_column_default.rb new file mode 100644 index 000000000..58f1e5552 --- /dev/null +++ b/db/migrate/20181104200750_change_favorites_column_default.rb @@ -0,0 +1,4 @@ +class ChangeFavoritesColumnDefault < ActiveRecord::Migration[5.2] + def change + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..24c15034a --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,33 @@ +# 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: 2018_11_04_195531) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "searches", force: :cascade do |t| + t.string "queery" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "users", force: :cascade do |t| + t.string "username" + t.string "uid", null: false + t.string "provider", null: false + t.string "favorites", array: true + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/test/controllers/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb new file mode 100644 index 000000000..c2632a720 --- /dev/null +++ b/test/controllers/sessions_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe SessionsController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/fixtures/searches.yml b/test/fixtures/searches.yml new file mode 100644 index 000000000..2e12c81e1 --- /dev/null +++ b/test/fixtures/searches.yml @@ -0,0 +1,7 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + queery: MyString + +two: + queery: MyString diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml new file mode 100644 index 000000000..952febd97 --- /dev/null +++ b/test/fixtures/users.yml @@ -0,0 +1,7 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + username: MyString + +two: + username: MyString diff --git a/test/models/search_test.rb b/test/models/search_test.rb new file mode 100644 index 000000000..f41f0e345 --- /dev/null +++ b/test/models/search_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Search do + let(:search) { Search.new } + + it "must be valid" do + value(search).must_be :valid? + end +end diff --git a/test/models/user_test.rb b/test/models/user_test.rb new file mode 100644 index 000000000..cc862ac2d --- /dev/null +++ b/test/models/user_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe User do + let(:user) { User.new } + + it "must be valid" do + value(user).must_be :valid? + end +end From e31dceca6b33ec4b1be39878922f68b95de6f1d5 Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Sun, 4 Nov 2018 13:12:13 -0800 Subject: [PATCH 3/9] fix recipe show process in wrapper --- app/controllers/pages_controller.rb | 10 ++++----- app/models/user.rb | 8 +++++++ app/views/pages/recipe.html.erb | 22 ++++++++++--------- app/views/pages/search.html.erb | 14 +----------- config/routes.rb | 3 +-- ...4200750_change_favorites_column_default.rb | 1 + db/schema.rb | 4 ++-- lib/edamam_wrapper.rb | 19 ++++++++++++---- lib/recipe.rb | 3 ++- 9 files changed, 46 insertions(+), 38 deletions(-) diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index a8d966213..d821f26e2 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -20,12 +20,10 @@ def search end def recipe - if params[:title] - if params[:url] - session[:recipe] = params - else - session[:recipe] = EdamamWrapper.recipe(params[:title]) - end + if params[:uri] + session[:recipe] = EdamamWrapper.recipe(params[:uri]) + else + session[:recipe] = EdamamWrapper.recipe(params[:title]) end @recipe = session[:recipe] end diff --git a/app/models/user.rb b/app/models/user.rb index 62420cfc8..6ef6ad250 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -7,4 +7,12 @@ def self.from_omniauth(auth) user.save! end end + + def add_to_favorites(uri) + unless self.favorites + self.favorites = [] + end + + self.favorites << uri + end end diff --git a/app/views/pages/recipe.html.erb b/app/views/pages/recipe.html.erb index 93ef87e16..a81356ad8 100644 --- a/app/views/pages/recipe.html.erb +++ b/app/views/pages/recipe.html.erb @@ -1,14 +1,16 @@

  • <%= @recipe["title"] %>

    • -
  • <%= image_tag(@recipe["image"]) %>
    • -
  • <%= link_to "full recipe", @recipe["url"] %>
    • -
  • - health info: - <%= reformat_array(@recipe["health_labels"]) %> -
    • -
  • dietary info: <%= reformat_array(@recipe["diet_labels"]) %>
    • -
  • calories: <%= @recipe["calories"] %>
    • - <% reformat_array(@recipe["ingredients"]).each do |ingredient| %> -
  • <%= ingredient %>
    • + <% if @recipe["image"] %> +
  • <%= image_tag(@recipe["image"]) %>
    • +
  • <%= link_to "full recipe", @recipe["url"] %>
    • +
  • + health info: + <%= reformat_array(@recipe["health_labels"]) %> +
    • +
  • dietary info: <%= reformat_array(@recipe["diet_labels"]) %>
    • +
  • calories: <%= @recipe["calories"] %>
    • + <% reformat_array(@recipe["ingredients"]).each do |ingredient| %> +
  • <%= ingredient %>
    • + <% end %> <% end %>
diff --git a/app/views/pages/search.html.erb b/app/views/pages/search.html.erb index 20e4bcfa2..199beee63 100644 --- a/app/views/pages/search.html.erb +++ b/app/views/pages/search.html.erb @@ -8,19 +8,7 @@

  • <%= recipe.title %>

  • <%= image_tag(recipe.image) %>
  • via <%= link_to "#{recipe.source}", recipe.url %>
    • -
  • - <%= form_tag recipe_path do %> - <%= hidden_field_tag "title", "#{recipe.title}" %> - <%= hidden_field_tag "image", "#{recipe.image}" %> - <%= hidden_field_tag "url", "#{recipe.url}" %> - <%= hidden_field_tag "source", "#{recipe.source}" %> - <%= hidden_field_tag "health_labels", "#{recipe.health_labels}" %> - <%= hidden_field_tag "diet_labels", "#{recipe.diet_labels}" %> - <%= hidden_field_tag "calories", "#{recipe.calories}" %> - <%= hidden_field_tag "ingredients", "#{recipe.ingredients}" %> - <%= submit_tag("details") %> - <% end %> -
    • +
  • <%= link_to "view details", recipe_path(:uri=> recipe.uri) %>
    • <% end %> <% end %> diff --git a/config/routes.rb b/config/routes.rb index 45bcf6ddf..79d28d60c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,10 +5,9 @@ root 'pages#home' post 'search', to: 'pages#search', as: 'search' get 'search/:queery', to: 'pages#search' - post 'recipe', to: 'pages#recipe', as: 'recipe' get 'recipe/:title', to: 'pages#recipe' get 'search', to: 'pages#search', as: 'search_get' - get 'recipe', to: 'pages#recipe', as: 'recipe_get' + get 'recipe', to: 'pages#recipe', as: 'recipe' get 'auth/:provider/callback', to: 'sessions#create' get 'auth/failure', to: redirect('/') get 'logout', to: 'sessions#destroy', as: 'logout' diff --git a/db/migrate/20181104200750_change_favorites_column_default.rb b/db/migrate/20181104200750_change_favorites_column_default.rb index 58f1e5552..5ab067748 100644 --- a/db/migrate/20181104200750_change_favorites_column_default.rb +++ b/db/migrate/20181104200750_change_favorites_column_default.rb @@ -1,4 +1,5 @@ class ChangeFavoritesColumnDefault < ActiveRecord::Migration[5.2] def change + change_column_default :users, :favorites, [] end end diff --git a/db/schema.rb b/db/schema.rb index 24c15034a..0c31dc61c 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2018_11_04_195531) do +ActiveRecord::Schema.define(version: 2018_11_04_200750) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,7 +25,7 @@ t.string "username" t.string "uid", null: false t.string "provider", null: false - t.string "favorites", array: true + t.string "favorites", default: [], array: true t.datetime "created_at", null: false t.datetime "updated_at", null: false end diff --git a/lib/edamam_wrapper.rb b/lib/edamam_wrapper.rb index 13088886f..f0c6bd18d 100644 --- a/lib/edamam_wrapper.rb +++ b/lib/edamam_wrapper.rb @@ -38,11 +38,22 @@ def self.recipe_squeezer(hits) return squeezed_recipes end - def self.recipe(title) - url = BASE_URL + "app_id=#{ID}&" + "app_key=#{KEY}&" + "q=#{title}" - data = HTTParty.get(url) - if data["hits"] + def self.recipe(ref) + if ref.include?("http://www.edamam.com/ontologies/edamam.owl") + url = BASE_URL + "app_id=#{ID}&" + "app_key=#{KEY}&" + "r=#{ref}" + else + url = BASE_URL + "app_id=#{ID}&" + "app_key=#{KEY}&" + "q=#{ref}" + end + + encoded_url = URI.encode(url) + data = HTTParty.get(encoded_url) + if data.include?("hits") && data["hits"] != [] recipe = recipe_squeezer(data["hits"]).first + elsif data["hits"] != [] + formatted = [{"recipe"=> data[0]}] + recipe = recipe_squeezer(formatted).first + else + recipe = Recipe.new({"label"=> "sorry, no results for this query"}) end return { diff --git a/lib/recipe.rb b/lib/recipe.rb index 17e45a650..e8dc50397 100644 --- a/lib/recipe.rb +++ b/lib/recipe.rb @@ -1,9 +1,10 @@ class Recipe - attr_reader :title, :image, :ingredients, :url, :source, :diet_labels, :health_labels, :calories + attr_reader :title, :image, :uri, :ingredients, :url, :source, :diet_labels, :health_labels, :calories def initialize(recipe_hash) @title = recipe_hash["label"] @image = recipe_hash["image"] + @uri = recipe_hash["uri"] @ingredients = recipe_hash["ingredientLines"] @url = recipe_hash["url"] @source = recipe_hash["source"] From c1682c8c3f42141942a2663fa73ed9882a12a0d3 Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Mon, 5 Nov 2018 09:38:16 -0800 Subject: [PATCH 4/9] style layouts --- app/assets/javascripts/users.js | 2 + app/assets/stylesheets/application.scss | 16 ++ app/assets/stylesheets/pages.scss | 299 ++++++++++++++++++++++ app/assets/stylesheets/users.scss | 3 + app/controllers/pages_controller.rb | 11 +- app/controllers/sessions_controller.rb | 2 +- app/controllers/users_controller.rb | 21 ++ app/helpers/pages_helper.rb | 8 +- app/helpers/users_helper.rb | 2 + app/models/user.rb | 8 +- app/views/layouts/application.html.erb | 24 +- app/views/pages/home.html.erb | 35 ++- app/views/pages/recipe.html.erb | 47 ++-- app/views/pages/search.html.erb | 27 +- app/views/users/favs.html.erb | 21 ++ config/routes.rb | 3 + lib/edamam_wrapper.rb | 47 ++-- lib/unsplash_wrapper.rb | 19 ++ test/controllers/users_controller_test.rb | 7 + 19 files changed, 522 insertions(+), 80 deletions(-) create mode 100644 app/assets/javascripts/users.js create mode 100644 app/assets/stylesheets/users.scss create mode 100644 app/controllers/users_controller.rb create mode 100644 app/helpers/users_helper.rb create mode 100644 app/views/users/favs.html.erb create mode 100644 lib/unsplash_wrapper.rb create mode 100644 test/controllers/users_controller_test.rb diff --git a/app/assets/javascripts/users.js b/app/assets/javascripts/users.js new file mode 100644 index 000000000..dee720fac --- /dev/null +++ b/app/assets/javascripts/users.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/application.scss b/app/assets/stylesheets/application.scss index 8b1701e58..510b2d1c3 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -16,3 +16,19 @@ @import "bootstrap"; /* Import scss content */ @import "**/*"; + +.login { + color: #111111; + right: 0; + position: fixed; + display: inline-block; + list-style: none; +} + +.login li { + background-color: #fefefe; + padding: .5vw 1vw .5vw 1vw; + margin: 1.5vw 1.5vw 0 1.2vw; + border-radius: 4px; + box-shadow: 1px 1px 5px #404040; +} diff --git a/app/assets/stylesheets/pages.scss b/app/assets/stylesheets/pages.scss index 0d6878aa1..71548c0dc 100644 --- a/app/assets/stylesheets/pages.scss +++ b/app/assets/stylesheets/pages.scss @@ -1,3 +1,302 @@ // Place all the styles related to the pages controller here. // They will automatically be included in application.css. // You can use Sass (SCSS) here: http://sass-lang.com/ +html { + height: 100vh; +} + +body { + height: 100vh; + font-family: Helvetica, sans-serif; +} + +.logo { + display: inline-block; + top: 0; + left: 0; + background-color: #fefefe; + padding: 1.2vw 3vw 1.2vw 3vw; + font-size: 4vw; + font-weight: 900; + font-family: Helvetica, sans-serif; + margin-bottom: 2vw; +} + +.logo a { + color: #111111; +} + +#home { + height: 100vh; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; +} + +#home form { + width: 26vw; +} + +.search, .recent_searches { + background-color: #fefefe; + color: #111111; + padding: 2vw 3vw 2vw 3vw; + border-radius: 4px; + box-shadow: 1px 1px 5px #404040; + width: 33vw; +} + +.search { + height: 5vw; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; +} + +.recent_searches { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + margin-top: 5vh; + height: 13vw; +} + +h1, h2 { + font-weight: 900; +} + +h2 { + font-size: 2.5vw; +} + +h1 { + font-size: 4vw; +} + +#home ul { + width: 25vw; + display: flex; + justify-content: flex-start; + flex-wrap: wrap; + list-style: none; + margin: 0; + margin-left: -.5vw; + padding: 0; +} + +#home li { + font-size: 1.3vw; + margin: 0 .5vw 0 .5vw; +} + +a { + color: #404040; +} + +a:hover { + color: black; +} + +#search { + height: 100vh; + display: flex; + flex-direction: column; + justify-content: center; +} + +.paginator { + margin-top: 6vw; + align-self: center; + font-size: 1.5vw; + display: flex; + align-items: center; + justify-content: space-between; +} + +.paginator a { + background-color: #fefefe; + padding: .2vw 1vw .2vw 1vw; +} + +.paginator span { + color: #111111; + font-size: 4vw; + margin: 0 3vw 0 3vw; + background-color: #fefefe; + padding: 0 1.5vw 0 1.5vw; +} + +#search .recipes { + display: flex; + justify-content: flex-start; + align-items: flex-start; + overflow: scroll; +} + +#search ul { + list-style: none; + color: #404040; + padding: 2vw 3vw 2vw 3vw; +} + +#search h1 { + z-index: 10; + transform: translateY(-35vw); + width: 30vw; + background-color: #fefefe; + margin-bottom: -35vw; + padding-left: .6vw; +} + +#search a { + color: black; +} + +.source { + margin-top: 0vw; +} + +.source a { + background-color: #fefefe; + padding-right: .6vw; + padding-left: .6vw; +} + +#search a:hover { + color: red; + text-decoration: none; +} + +#search .nohover:hover { + color: black; +} + +#search img { + width: 35vw; + border-radius: 50%; + z-index: 1; +} + +#search ul { + margin-bottom: 23vw; +} + + + + +#recipe { + display: flex; + align-items: flex-end; + padding-top: 4vw; +} + +#recipe h1 { + margin-bottom: 3vw; + padding-left: 3vw; + background-color: #fefefe; + color: #111111; +} + +#recipe ul { + list-style: none; +} + +#recipe li { + font-size: 1.3vw; +} + +#recipe img { + width: 30vw; + border-radius: 50%; + margin-top: 3vw; +} + +.ingredients { + margin-top: 1vw; +} + +.ingredients li:first-of-type { + list-style: none; +} + +.recipe_info { + margin-bottom: 5vw; +} + +.recipe_info li:first-of-type { + text-decoration: underline; +} + +.save_recipe { + text-align: center; + transform: translateY(-20vw); + background-color: #fefefe; + text-decoration: underline; +} + +#recipe a:hover { + color: red; + text-decoration: none; +} + + + +#favs { + padding-top: 4vw; +} + +#favs h1 { + display: inline-block; + padding-left: 3vw; + padding-right: 1vw; + background-color: #fefefe; + color: #111111; +} + +#favs .favorites { + display: flex; + align-items: flex-end; + overflow: scroll; +} + +#favs ul { + list-style: none; +} + +#favs img { + width: 25vw; + border-radius: 50%; +} + +#favs h2 { + transform: translateY(12vw); + background-color: #fefefe; + padding: .6vw 0 .6vw 1vw; + width: 25vw; +} + +#favs h2 a { + text-decoration: none; + color: #111111; +} + +#favs h2 a:hover { + color: red; +} + +#favs ul div { + transform: translateY(-10vw); + background-color: #fefefe; + width: 10vw; +} + +#favs a { + text-decoration: underline; +} + +#favs a:hover { + color: red; +} diff --git a/app/assets/stylesheets/users.scss b/app/assets/stylesheets/users.scss new file mode 100644 index 000000000..1efc835cc --- /dev/null +++ b/app/assets/stylesheets/users.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the users controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index d821f26e2..a28130321 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -1,6 +1,7 @@ class PagesController < ApplicationController def home @recent_searches = Search.limit(10).reverse_order + @bg_image = UnsplashWrapper.image("food", true) end def search @@ -9,22 +10,24 @@ def search Search.create(queery: params[:queery]) end + @bg_image = UnsplashWrapper.image(session[:queery], true) + if params[:page] session[:page] = params[:page].to_i else session[:page] = 1 end - puts session[:queery] @recipes = EdamamWrapper.search(session[:queery], session[:page]) end def recipe if params[:uri] - session[:recipe] = EdamamWrapper.recipe(params[:uri]) + recipe = EdamamWrapper.recipe(params[:uri]) else - session[:recipe] = EdamamWrapper.recipe(params[:title]) + recipe = EdamamWrapper.recipe(params[:title]) end - @recipe = session[:recipe] + session[:uri] = recipe.uri + @recipe = recipe end end diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 3e095643c..3f6566a18 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -2,7 +2,7 @@ class SessionsController < ApplicationController def create user = User.from_omniauth(request.env["omniauth.auth"]) session[:user_id] = user.id - redirect_to root_path + redirect_to recipe_path(:uri=> session[:uri]) end def destroy diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb new file mode 100644 index 000000000..619a11d1f --- /dev/null +++ b/app/controllers/users_controller.rb @@ -0,0 +1,21 @@ +class UsersController < ApplicationController + BASE = "http://www.edamam.com/ontologies/edamam.owl#" + + def favorite + @current_user.add_to_favorites((BASE + params[:uri])) + redirect_back fallback_location: '/' + end + + def remove + @current_user.remove((BASE + params[:uri])) + redirect_back fallback_location: '/' + end + + def favs + @favs = [] + @current_user.favorites.each do |uri| + @favs << EdamamWrapper.recipe((BASE + uri)) + end + @bg_image = UnsplashWrapper.image("kitchen", true) + end +end diff --git a/app/helpers/pages_helper.rb b/app/helpers/pages_helper.rb index 45df844a8..849a2f81c 100644 --- a/app/helpers/pages_helper.rb +++ b/app/helpers/pages_helper.rb @@ -2,15 +2,15 @@ module PagesHelper def paginator(page, recipes) output = [] if page > 1 - output << (link_to "previous page ", search_path(:page=> (session[:page] - 1))) + output << (link_to "prev page", search_path(:page=> (session[:page] - 1))) else - output << "previous page " + output << "prev page" end - output << "#{session[:page]} " + output << " #{session[:page]} " if recipes.length == 10 output << (link_to "next page", search_path(:page=> (session[:page] + 1))) else - output << "next page" + output << "next page" end return output.join.html_safe diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb new file mode 100644 index 000000000..2310a240d --- /dev/null +++ b/app/helpers/users_helper.rb @@ -0,0 +1,2 @@ +module UsersHelper +end diff --git a/app/models/user.rb b/app/models/user.rb index 6ef6ad250..d0da5c6b9 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -12,7 +12,13 @@ def add_to_favorites(uri) unless self.favorites self.favorites = [] end - + self.favorites << uri + self.save + end + + def remove(uri) + self.favorites.delete(uri) + self.save end end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index c2d6f3798..21d785af2 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -7,15 +7,27 @@ <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + + - <% if @current_user %> - Signed in as <%= @current_user.username %>! - <%= link_to "Sign out", logout_path, id: "sign_out" %> - <% else %> - <%= link_to "Sign in with Google", "/auth/google_oauth2", id: "sign_in" %> - <% end %> + + + <%= yield %> diff --git a/app/views/pages/home.html.erb b/app/views/pages/home.html.erb index 35cf810c9..d821bd3c9 100644 --- a/app/views/pages/home.html.erb +++ b/app/views/pages/home.html.erb @@ -1,13 +1,24 @@ -

    Food.

    -<%= form_tag search_path do %> - <%= label_tag(:queery, "Ingredient?") %> - <%= text_field_tag(:queery) %> - <%= submit_tag("Explore") %> -<% end %> +
    +
    +
    +
    + <%= form_tag search_path do %> + <%= label_tag(:queery, "Ingredient(s)?") %> + <%= text_field_tag(:queery) %> + <%= submit_tag("Explore") %> + <% end %> +
    +
    -

    most recent searches:

    -
      -<% @recent_searches.each do |search| %> -
    • <%= link_to "#{search.queery}", search_path(:queery=> search.queery) %>
      • -<% end %> -
    +
    +
    +

    most recent searches:

    +
      + <% @recent_searches.each do |search| %> +
    • <%= link_to "#{search.queery}", search_path(:queery=> search.queery) %>
      • + <% end %> +
    +
    +
    +
    +
    diff --git a/app/views/pages/recipe.html.erb b/app/views/pages/recipe.html.erb index a81356ad8..606077594 100644 --- a/app/views/pages/recipe.html.erb +++ b/app/views/pages/recipe.html.erb @@ -1,16 +1,33 @@ -
      -

    • <%= @recipe["title"] %>

      • - <% if @recipe["image"] %> -
    • <%= image_tag(@recipe["image"]) %>
      • -
    • <%= link_to "full recipe", @recipe["url"] %>
      • -
    • - health info: - <%= reformat_array(@recipe["health_labels"]) %> -
      • -
    • dietary info: <%= reformat_array(@recipe["diet_labels"]) %>
      • -
    • calories: <%= @recipe["calories"] %>
      • - <% reformat_array(@recipe["ingredients"]).each do |ingredient| %> -
    • <%= ingredient %>
      • +
      +
        +

      • <%= @recipe.title %>

        • + <% if @recipe.image %> +
      • <%= image_tag(@recipe.image) %>
        • + <% if @current_user %> +
      • + <% recipe = @recipe.uri.split("owl#").last %> + <% if @current_user.favorites.include?(@recipe.uri) %> + <%= link_to "remove from favs", remove_path(:uri=> recipe), method: :delete %> + <% else %> + <%= link_to "save this recipeee", favorite_path(:uri=> recipe) %> + <% end %> +
        • + <% end %> +
      +
        +
      • <%= link_to "via #{@recipe.source}", @recipe.url %>
        • +
      • + health info: + <%= @recipe.health_labels %> +
        • +
      • dietary info: <%= @recipe.diet_labels %>
        • +
      • calories: <%= @recipe.calories %>
        • +
          +

        • Ingredients:

          • + <% @recipe.ingredients.each do |ingredient| %> +
        • <%= ingredient %>
          • + <% end %> +
        <% end %> - <% end %> -
      +
    + diff --git a/app/views/pages/search.html.erb b/app/views/pages/search.html.erb index 199beee63..ff1d17f6b 100644 --- a/app/views/pages/search.html.erb +++ b/app/views/pages/search.html.erb @@ -1,14 +1,19 @@ -<%= paginator(session[:page], @recipes) %> +
    +
    + <%= paginator(session[:page], @recipes) %> +
    -<% if @recipes[0].url == nil %> + <% if @recipes[0].url == nil %>

    <%= @recipes[0].title %>

    -<% else %> - <% @recipes.each do |recipe| %> -
      -

    • <%= recipe.title %>

      • -
    • <%= image_tag(recipe.image) %>
      • -
    • via <%= link_to "#{recipe.source}", recipe.url %>
      • -
    • <%= link_to "view details", recipe_path(:uri=> recipe.uri) %>
      • -
    + <% else %> +
    + <% @recipes.each do |recipe| %> +
      +
    • <%= image_tag(recipe.image) %>
      • +

    • <%= link_to recipe.title, recipe_path(:uri=> recipe.uri) %>

      • +
    • <%= link_to "via #{recipe.source}", recipe.url %>
      • +
    + <% end %> +
    <% end %> -<% end %> +
    diff --git a/app/views/users/favs.html.erb b/app/views/users/favs.html.erb new file mode 100644 index 000000000..d04f3ea0b --- /dev/null +++ b/app/views/users/favs.html.erb @@ -0,0 +1,21 @@ +
    +

    My Favorites:

    + +
    + <% @favs.each do |fav| %> +
      + <% if fav.uri %> +

    • <%= link_to fav.title, recipe_path(:uri=> fav.uri) %>

      • +
    • <%= image_tag(fav.image) %>
      • +
      +
    • via <%= link_to "#{fav.source}", fav.url %>
      • +
    • <%= link_to "view details", recipe_path(:uri=> fav.uri) %>
      • +
    • <%= link_to "remove from favs", remove_path(:uri=> fav.uri.split("owl#").last), method: :delete %>
      • +
      + <% else %> +

    • <%= fav.title %>

      • + <% end %> +
    + <% end %> +
    +
    diff --git a/config/routes.rb b/config/routes.rb index 79d28d60c..d81127449 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,6 +5,9 @@ root 'pages#home' post 'search', to: 'pages#search', as: 'search' get 'search/:queery', to: 'pages#search' + get 'recipe/favorite', to: 'users#favorite', as: 'favorite' + delete 'recipe/remove', to: 'users#remove', as: 'remove' + get 'favs', to: 'users#favs', as: 'favs' get 'recipe/:title', to: 'pages#recipe' get 'search', to: 'pages#search', as: 'search_get' get 'recipe', to: 'pages#recipe', as: 'recipe' diff --git a/lib/edamam_wrapper.rb b/lib/edamam_wrapper.rb index f0c6bd18d..a798eed2c 100644 --- a/lib/edamam_wrapper.rb +++ b/lib/edamam_wrapper.rb @@ -16,28 +16,17 @@ def self.search(queery, page = nil) data = HTTParty.get(url) end - if data["hits"] != [] + if data.include?("Error") + return recipe_squeezer([{"recipe"=> {"label"=> "API Error... too many requests most likely. Please wait for cool down..."}}]) + elsif data["hits"] != [] return recipe_squeezer(data["hits"]) elsif page > 1 && data["hits"] == [] - puts "elsif" return recipe_squeezer([{"recipe"=> {"label"=> "looks like there are no further results for this search!"}}]) else - puts "else" return recipe_squeezer([{"recipe"=> {"label"=> "looks like there were no results for this search"}}]) end end - private - - def self.recipe_squeezer(hits) - squeezed_recipes = [] - hits.each do |hash| - squeezed_recipes << Recipe.new(hash["recipe"]) - end - - return squeezed_recipes - end - def self.recipe(ref) if ref.include?("http://www.edamam.com/ontologies/edamam.owl") url = BASE_URL + "app_id=#{ID}&" + "app_key=#{KEY}&" + "r=#{ref}" @@ -47,24 +36,30 @@ def self.recipe(ref) encoded_url = URI.encode(url) data = HTTParty.get(encoded_url) - if data.include?("hits") && data["hits"] != [] + + if data.include?("Error") + recipe = Recipe.new({"label"=> "API Error... too many requests most likely. Please wait for cool down..."}) + elsif data.include?("hits") && data["hits"] != [] recipe = recipe_squeezer(data["hits"]).first - elsif data["hits"] != [] + elsif data.include?("hits") == false formatted = [{"recipe"=> data[0]}] recipe = recipe_squeezer(formatted).first else recipe = Recipe.new({"label"=> "sorry, no results for this query"}) end - return { - "title"=> recipe.title, - "image"=> recipe.image, - "url"=> recipe.url, - "source"=> recipe.source, - "health_labels"=> recipe.health_labels, - "diet_labels"=> recipe.diet_labels, - "calories"=> recipe.calories, - "ingredients"=> recipe.ingredients - } + return recipe end + + private + + def self.recipe_squeezer(hits) + squeezed_recipes = [] + hits.each do |hash| + squeezed_recipes << Recipe.new(hash["recipe"]) + end + + return squeezed_recipes + end + end diff --git a/lib/unsplash_wrapper.rb b/lib/unsplash_wrapper.rb new file mode 100644 index 000000000..f5d8b429a --- /dev/null +++ b/lib/unsplash_wrapper.rb @@ -0,0 +1,19 @@ +require 'httparty' + +class UnsplashWrapper + BASE = "https://api.unsplash.com/search/photos?query=" + ID = "&client_id=cb149b98b1efbc1c84b7ecd45cee97f6db26af9bd7b7d6612cbdbc7d5f30d57e&orientation=landscape&per_page=50" + + def self.image(queery, sample = false) + + url = BASE + queery + ID + data = HTTParty.get(url) + + if sample + sample = data["results"].sample + return sample["urls"]["full"].html_safe + else + return data["results"][0]["urls"]["full"].html_safe + end + end +end diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb new file mode 100644 index 000000000..89decb54e --- /dev/null +++ b/test/controllers/users_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe UsersController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From c3d684aabc907f079238e35ff71ea502618a4fc5 Mon Sep 17 00:00:00 2001 From: Hayden Walls Date: Mon, 5 Nov 2018 10:03:57 -0800 Subject: [PATCH 5/9] fix unsplash bug --- lib/unsplash_wrapper.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/unsplash_wrapper.rb b/lib/unsplash_wrapper.rb index f5d8b429a..8589d71cf 100644 --- a/lib/unsplash_wrapper.rb +++ b/lib/unsplash_wrapper.rb @@ -9,6 +9,10 @@ def self.image(queery, sample = false) url = BASE + queery + ID data = HTTParty.get(url) + if data["results"].empty? + return "".html_safe + end + if sample sample = data["results"].sample return sample["urls"]["full"].html_safe From 0eefcc9dd44c354a40117d255aee7034cf70d063 Mon Sep 17 00:00:00 2001 From: Hayden Walls Date: Mon, 5 Nov 2018 10:09:35 -0800 Subject: [PATCH 6/9] fix page title --- app/views/layouts/application.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 21d785af2..fa382959e 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,7 +1,7 @@ - ApiMuncher + Food. <%= csrf_meta_tags %> <%= csp_meta_tag %> From 1dce4b2eed1e13f60e23bd826a6edd0a1a40308b Mon Sep 17 00:00:00 2001 From: Hayden Walls Date: Mon, 5 Nov 2018 10:20:32 -0800 Subject: [PATCH 7/9] fix css --- app/assets/stylesheets/application.scss | 5 ++--- app/assets/stylesheets/pages.scss | 7 +++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 510b2d1c3..067ca206a 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -18,7 +18,7 @@ @import "**/*"; .login { - color: #111111; + color: #000000; right: 0; position: fixed; display: inline-block; @@ -29,6 +29,5 @@ background-color: #fefefe; padding: .5vw 1vw .5vw 1vw; margin: 1.5vw 1.5vw 0 1.2vw; - border-radius: 4px; - box-shadow: 1px 1px 5px #404040; + border-radius: 1px; } diff --git a/app/assets/stylesheets/pages.scss b/app/assets/stylesheets/pages.scss index 71548c0dc..cd012cccd 100644 --- a/app/assets/stylesheets/pages.scss +++ b/app/assets/stylesheets/pages.scss @@ -19,7 +19,7 @@ body { font-size: 4vw; font-weight: 900; font-family: Helvetica, sans-serif; - margin-bottom: 2vw; + margin: 1vw 0 1vw 1vw; } .logo a { @@ -41,9 +41,8 @@ body { .search, .recent_searches { background-color: #fefefe; color: #111111; - padding: 2vw 3vw 2vw 3vw; - border-radius: 4px; - box-shadow: 1px 1px 5px #404040; + padding: 3vw 3vw 3vw 3vw; + border-radius: 1px; width: 33vw; } From 6e8b16148e68b64b582ea20fb2d3db2c2baf7ab1 Mon Sep 17 00:00:00 2001 From: Hayden Walls Date: Mon, 5 Nov 2018 10:27:34 -0800 Subject: [PATCH 8/9] fix layout --- app/assets/stylesheets/pages.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/pages.scss b/app/assets/stylesheets/pages.scss index cd012cccd..4ab0e6e76 100644 --- a/app/assets/stylesheets/pages.scss +++ b/app/assets/stylesheets/pages.scss @@ -60,6 +60,7 @@ body { justify-content: center; align-items: center; margin-top: 5vh; + padding: 4vw 3vw 4vw 3vw; height: 13vw; } From adfb3aa34c6240856120fb093ca6cb6b9e2b8aa2 Mon Sep 17 00:00:00 2001 From: Hayden Walls Date: Mon, 5 Nov 2018 10:30:06 -0800 Subject: [PATCH 9/9] fix layout --- app/assets/stylesheets/pages.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/pages.scss b/app/assets/stylesheets/pages.scss index 4ab0e6e76..f8b8d8125 100644 --- a/app/assets/stylesheets/pages.scss +++ b/app/assets/stylesheets/pages.scss @@ -61,7 +61,7 @@ body { align-items: center; margin-top: 5vh; padding: 4vw 3vw 4vw 3vw; - height: 13vw; + height: 15vw; } h1, h2 {