From 0161c3807b714f8efdd28b97cc61a67e1785598c Mon Sep 17 00:00:00 2001 From: Natasha Ewing Date: Mon, 31 Oct 2016 16:55:36 -0700 Subject: [PATCH 01/11] rails new with gems --- .gitignore | 17 ++ Gemfile | 63 ++++++ Gemfile.lock | 199 ++++++++++++++++++ README.rdoc | 28 +++ Rakefile | 6 + app/assets/images/.keep | 0 app/assets/javascripts/application.js | 16 ++ app/assets/stylesheets/application.css | 15 ++ app/controllers/application_controller.rb | 5 + app/controllers/concerns/.keep | 0 app/helpers/application_helper.rb | 2 + app/mailers/.keep | 0 app/models/.keep | 0 app/models/concerns/.keep | 0 app/views/layouts/application.html.erb | 14 ++ bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 29 +++ bin/spring | 16 ++ config.ru | 4 + config/application.rb | 26 +++ config/boot.rb | 3 + config/database.yml | 25 +++ config/environment.rb | 5 + config/environments/development.rb | 41 ++++ config/environments/production.rb | 79 +++++++ config/environments/test.rb | 42 ++++ config/initializers/assets.rb | 11 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cookies_serializer.rb | 3 + .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/session_store.rb | 3 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 23 ++ config/routes.rb | 56 +++++ config/secrets.yml | 22 ++ db/seeds.rb | 7 + lib/assets/.keep | 0 lib/tasks/.keep | 0 log/.keep | 0 public/404.html | 67 ++++++ public/422.html | 67 ++++++ public/500.html | 66 ++++++ public/favicon.ico | 0 public/robots.txt | 5 + test/controllers/.keep | 0 test/fixtures/.keep | 0 test/helpers/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/test_helper.rb | 10 + vendor/assets/javascripts/.keep | 0 vendor/assets/stylesheets/.keep | 0 57 files changed, 1041 insertions(+) create mode 100644 .gitignore create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 README.rdoc create mode 100644 Rakefile create mode 100644 app/assets/images/.keep create mode 100644 app/assets/javascripts/application.js create mode 100644 app/assets/stylesheets/application.css create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/helpers/application_helper.rb create mode 100644 app/mailers/.keep create mode 100644 app/models/.keep create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/application.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 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb 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/assets.rb create mode 100644 config/initializers/backtrace_silencers.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/session_store.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/routes.rb create mode 100644 config/secrets.yml create mode 100644 db/seeds.rb create mode 100644 lib/assets/.keep create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/404.html create mode 100644 public/422.html create mode 100644 public/500.html create mode 100644 public/favicon.ico create mode 100644 public/robots.txt create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.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/test_helper.rb create mode 100644 vendor/assets/javascripts/.keep create mode 100644 vendor/assets/stylesheets/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..050c9d95c --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +# 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 the default SQLite database. +/db/*.sqlite3 +/db/*.sqlite3-journal + +# Ignore all logfiles and tempfiles. +/log/* +!/log/.keep +/tmp diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..4a7b0acf0 --- /dev/null +++ b/Gemfile @@ -0,0 +1,63 @@ + + +source 'https://rubygems.org' + + +# Required due to an incompatibility between TurboLinks and Foundation. +gem 'jquery-turbolinks' + +gem 'faker' + +gem 'awesome_print' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '4.2.7' +# Use sqlite3 as the database for Active Record +gem 'sqlite3' +# Use SCSS for stylesheets +gem 'sass-rails', '~> 5.0' +# Use Uglifier as compressor for JavaScript assets +gem 'uglifier', '>= 1.3.0' +# Use CoffeeScript for .coffee assets and views +gem 'coffee-rails', '~> 4.1.0' +# See https://github.com/rails/execjs#readme for more supported runtimes +# gem 'therubyracer', platforms: :ruby + +# Use jquery as the JavaScript library +gem 'jquery-rails' +# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks +gem 'turbolinks' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +gem 'jbuilder', '~> 2.0' +# bundle exec rake doc:rails generates the API under doc/api. +gem 'sdoc', '~> 0.4.0', group: :doc + +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use Unicorn as the app server +# gem 'unicorn' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# API GEMS +gem 'httparty' + +gem 'foundation-rails' + + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug' + gem 'dotenv-rails' + gem 'better_errors' +end + +group :development do + # Access an IRB console on exception pages or by using <%= console %> in views + gem 'web-console', '~> 2.0' + gem 'dotenv-rails' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..2c49e4e7f --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,199 @@ +GEM + remote: https://rubygems.org/ + specs: + actionmailer (4.2.7) + actionpack (= 4.2.7) + actionview (= 4.2.7) + activejob (= 4.2.7) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 1.0, >= 1.0.5) + actionpack (4.2.7) + actionview (= 4.2.7) + activesupport (= 4.2.7) + rack (~> 1.6) + rack-test (~> 0.6.2) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (4.2.7) + activesupport (= 4.2.7) + builder (~> 3.1) + erubis (~> 2.7.0) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + activejob (4.2.7) + activesupport (= 4.2.7) + globalid (>= 0.3.0) + activemodel (4.2.7) + activesupport (= 4.2.7) + builder (~> 3.1) + activerecord (4.2.7) + activemodel (= 4.2.7) + activesupport (= 4.2.7) + arel (~> 6.0) + activesupport (4.2.7) + i18n (~> 0.7) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + arel (6.0.3) + awesome_print (1.7.0) + babel-source (5.8.35) + babel-transpiler (0.7.0) + babel-source (>= 4.0, < 6) + execjs (~> 2.0) + better_errors (2.1.1) + coderay (>= 1.0.0) + erubis (>= 2.6.6) + rack (>= 0.9.0) + binding_of_caller (0.7.2) + debug_inspector (>= 0.0.1) + builder (3.2.2) + byebug (9.0.6) + coderay (1.1.1) + coffee-rails (4.1.1) + coffee-script (>= 2.2.0) + railties (>= 4.0.0, < 5.1.x) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.10.0) + concurrent-ruby (1.0.2) + debug_inspector (0.0.2) + dotenv (2.1.1) + dotenv-rails (2.1.1) + dotenv (= 2.1.1) + railties (>= 4.0, < 5.1) + erubis (2.7.0) + execjs (2.7.0) + faker (1.6.6) + i18n (~> 0.5) + foundation-rails (6.2.4.0) + railties (>= 3.1.0) + sass (>= 3.3.0, < 3.5) + sprockets-es6 (>= 0.9.0) + globalid (0.3.7) + activesupport (>= 4.1.0) + httparty (0.14.0) + multi_xml (>= 0.5.2) + i18n (0.7.0) + jbuilder (2.6.0) + activesupport (>= 3.0.0, < 5.1) + multi_json (~> 1.2) + jquery-rails (4.2.1) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + jquery-turbolinks (2.1.0) + railties (>= 3.1.0) + turbolinks + json (1.8.3) + loofah (2.0.3) + nokogiri (>= 1.5.9) + mail (2.6.4) + mime-types (>= 1.16, < 4) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mini_portile2 (2.1.0) + minitest (5.9.1) + multi_json (1.12.1) + multi_xml (0.5.5) + nokogiri (1.6.8.1) + mini_portile2 (~> 2.1.0) + rack (1.6.4) + rack-test (0.6.3) + rack (>= 1.0) + rails (4.2.7) + actionmailer (= 4.2.7) + actionpack (= 4.2.7) + actionview (= 4.2.7) + activejob (= 4.2.7) + activemodel (= 4.2.7) + activerecord (= 4.2.7) + activesupport (= 4.2.7) + bundler (>= 1.3.0, < 2.0) + railties (= 4.2.7) + sprockets-rails + rails-deprecated_sanitizer (1.0.3) + activesupport (>= 4.2.0.alpha) + rails-dom-testing (1.0.7) + activesupport (>= 4.2.0.beta, < 5.0) + nokogiri (~> 1.6.0) + rails-deprecated_sanitizer (>= 1.0.1) + rails-html-sanitizer (1.0.3) + loofah (~> 2.0) + railties (4.2.7) + actionpack (= 4.2.7) + activesupport (= 4.2.7) + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (11.3.0) + rdoc (4.2.2) + json (~> 1.4) + sass (3.4.22) + sass-rails (5.0.6) + railties (>= 4.0.0, < 6) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + sdoc (0.4.2) + json (~> 1.7, >= 1.7.7) + rdoc (~> 4.0) + spring (2.0.0) + activesupport (>= 4.2) + sprockets (3.7.0) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-es6 (0.9.2) + babel-source (>= 5.8.11) + babel-transpiler + sprockets (>= 3.0.0) + sprockets-rails (3.2.0) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + sqlite3 (1.3.12) + thor (0.19.1) + thread_safe (0.3.5) + tilt (2.0.5) + turbolinks (5.0.1) + turbolinks-source (~> 5) + turbolinks-source (5.0.0) + tzinfo (1.2.2) + thread_safe (~> 0.1) + uglifier (3.0.3) + execjs (>= 0.3.0, < 3) + web-console (2.3.0) + activemodel (>= 4.0) + binding_of_caller (>= 0.7.2) + railties (>= 4.0) + sprockets-rails (>= 2.0, < 4.0) + +PLATFORMS + ruby + +DEPENDENCIES + awesome_print + better_errors + byebug + coffee-rails (~> 4.1.0) + dotenv-rails + faker + foundation-rails + httparty + jbuilder (~> 2.0) + jquery-rails + jquery-turbolinks + rails (= 4.2.7) + sass-rails (~> 5.0) + sdoc (~> 0.4.0) + spring + sqlite3 + turbolinks + uglifier (>= 1.3.0) + web-console (~> 2.0) + +BUNDLED WITH + 1.13.6 diff --git a/README.rdoc b/README.rdoc new file mode 100644 index 000000000..dd4e97e22 --- /dev/null +++ b/README.rdoc @@ -0,0 +1,28 @@ +== README + +This README would normally document whatever steps are necessary to get the +application up and running. + +Things you may want to cover: + +* Ruby version + +* System dependencies + +* Configuration + +* Database creation + +* Database initialization + +* How to run the test suite + +* Services (job queues, cache servers, search engines, etc.) + +* Deployment instructions + +* ... + + +Please feel free to use a different markup language if you do not plan to run +rake doc:app. diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..ba6b733dd --- /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 File.expand_path('../config/application', __FILE__) + +Rails.application.load_tasks 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..e07c5a830 --- /dev/null +++ b/app/assets/javascripts/application.js @@ -0,0 +1,16 @@ +// 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, vendor/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. +// +// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details +// about supported directives. +// +//= require jquery +//= require jquery_ujs +//= require turbolinks +//= require_tree . diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css new file mode 100644 index 000000000..f9cd5b348 --- /dev/null +++ b/app/assets/stylesheets/application.css @@ -0,0 +1,15 @@ +/* + * This is a manifest file that'll be compiled into application.css, which will include all the files + * listed below. + * + * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, + * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path. + * + * You're free to add application-wide styles to this file and they'll appear at the bottom of the + * compiled file so the styles you add here take precedence over styles defined in any styles + * defined in the other CSS/SCSS files in this directory. It is generally better to create a new + * file per style scope. + * + *= require_tree . + *= require_self + */ diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..d83690e1b --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,5 @@ +class ApplicationController < ActionController::Base + # Prevent CSRF attacks by raising an exception. + # For APIs, you may want to use :null_session instead. + protect_from_forgery with: :exception +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb 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/mailers/.keep b/app/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/models/.keep b/app/models/.keep new file mode 100644 index 000000000..e69de29bb 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..237dbba45 --- /dev/null +++ b/app/views/layouts/application.html.erb @@ -0,0 +1,14 @@ + + + + ApiMuncher + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %> + <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %> + <%= csrf_meta_tags %> + + + +<%= yield %> + + + diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..66e9889e8 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..0138d79b7 --- /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', __FILE__) +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..acdb2c138 --- /dev/null +++ b/bin/setup @@ -0,0 +1,29 @@ +#!/usr/bin/env ruby +require 'pathname' + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +Dir.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 || bundle install" + + # puts "\n== Copying sample files ==" + # unless File.exist?("config/database.yml") + # system "cp config/database.yml.sample config/database.yml" + # end + + puts "\n== Preparing database ==" + system "bin/rake db:setup" + + puts "\n== Removing old logs and tempfiles ==" + system "rm -f log/*" + system "rm -rf tmp/cache" + + puts "\n== Restarting application server ==" + system "touch tmp/restart.txt" +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..9bc076b9e --- /dev/null +++ b/bin/spring @@ -0,0 +1,16 @@ +#!/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) + if spring = lockfile.specs.detect { |spec| spec.name == "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/config.ru b/config.ru new file mode 100644 index 000000000..bd83b2541 --- /dev/null +++ b/config.ru @@ -0,0 +1,4 @@ +# This file is used by Rack-based servers to start the application. + +require ::File.expand_path('../config/environment', __FILE__) +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 000000000..20568697a --- /dev/null +++ b/config/application.rb @@ -0,0 +1,26 @@ +require File.expand_path('../boot', __FILE__) + +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 + # Settings in config/environments/* take precedence over those specified here. + # Application configuration should go into files in config/initializers + # -- all .rb files in that directory are automatically loaded. + + # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. + # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC. + # config.time_zone = 'Central Time (US & Canada)' + + # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. + # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] + # config.i18n.default_locale = :de + + # Do not swallow errors in after_commit/after_rollback callbacks. + config.active_record.raise_in_transactional_callbacks = true + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..6b750f00b --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,3 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..1c1a37ca8 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,25 @@ +# SQLite version 3.x +# gem install sqlite3 +# +# Ensure the SQLite 3 gem is defined in your Gemfile +# gem 'sqlite3' +# +default: &default + adapter: sqlite3 + pool: 5 + timeout: 5000 + +development: + <<: *default + database: db/development.sqlite3 + +# 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: db/test.sqlite3 + +production: + <<: *default + database: db/production.sqlite3 diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..ee8d90dc6 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require File.expand_path('../application', __FILE__) + +# 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..b55e2144b --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,41 @@ +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 and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = 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 + + # 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 + + # Asset digests allow you to set far-future HTTP expiration dates on all assets, + # yet still be able to expire them through the digest params. + config.assets.digest = true + + # Adds additional error checking when serving assets at runtime. + # Checks for improperly declared sprockets dependencies. + # Raises helpful error messages. + config.assets.raise_runtime_errors = true + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..5c1b32e48 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,79 @@ +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 + + # Enable Rack::Cache to put a simple HTTP cache in front of your application + # Add `rack-cache` to your Gemfile before enabling this. + # For large-scale production use, consider using a caching reverse proxy like + # NGINX, varnish or squid. + # config.action_dispatch.rack_cache = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.serve_static_files = 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 + + # Asset digests allow you to set far-future HTTP expiration dates on all assets, + # yet still be able to expire them through the digest params. + config.assets.digest = true + + # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb + + # 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 + + # 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 = [ :subdomain, :uuid ] + + # Use a different logger for distributed setups. + # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new) + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # 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 + + # 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..1c19f08b2 --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,42 @@ +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 static file server for tests with Cache-Control for performance. + config.serve_static_files = true + config.static_cache_control = 'public, max-age=3600' + + # 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 + + # 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 + + # Randomize the order test cases are executed. + config.active_support.test_order = :random + + # 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/assets.rb b/config/initializers/assets.rb new file mode 100644 index 000000000..01ef3e663 --- /dev/null +++ b/config/initializers/assets.rb @@ -0,0 +1,11 @@ +# 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 + +# Precompile additional assets. +# application.js, application.css, and all non-JS/CSS in app/assets folder are already added. +# Rails.application.config.assets.precompile += %w( search.js ) 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/cookies_serializer.rb b/config/initializers/cookies_serializer.rb new file mode 100644 index 000000000..7f70458de --- /dev/null +++ b/config/initializers/cookies_serializer.rb @@ -0,0 +1,3 @@ +# Be sure to restart your server when you modify this file. + +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/session_store.rb b/config/initializers/session_store.rb new file mode 100644 index 000000000..6cc0e03e4 --- /dev/null +++ b/config/initializers/session_store.rb @@ -0,0 +1,3 @@ +# Be sure to restart your server when you modify this file. + +Rails.application.config.session_store :cookie_store, key: '_api-muncher_session' diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..33725e95f --- /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] if respond_to?(:wrap_parameters) +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..065395716 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,23 @@ +# 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. +# +# 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/routes.rb b/config/routes.rb new file mode 100644 index 000000000..3f66539d5 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,56 @@ +Rails.application.routes.draw do + # The priority is based upon order of creation: first created -> highest priority. + # See how all your routes lay out with "rake routes". + + # You can have the root of your site routed with "root" + # root 'welcome#index' + + # Example of regular route: + # get 'products/:id' => 'catalog#view' + + # Example of named route that can be invoked with purchase_url(id: product.id) + # get 'products/:id/purchase' => 'catalog#purchase', as: :purchase + + # Example resource route (maps HTTP verbs to controller actions automatically): + # resources :products + + # Example resource route with options: + # resources :products do + # member do + # get 'short' + # post 'toggle' + # end + # + # collection do + # get 'sold' + # end + # end + + # Example resource route with sub-resources: + # resources :products do + # resources :comments, :sales + # resource :seller + # end + + # Example resource route with more complex sub-resources: + # resources :products do + # resources :comments + # resources :sales do + # get 'recent', on: :collection + # end + # end + + # Example resource route with concerns: + # concern :toggleable do + # post 'toggle' + # end + # resources :posts, concerns: :toggleable + # resources :photos, concerns: :toggleable + + # Example resource route within a namespace: + # namespace :admin do + # # Directs /admin/products/* to Admin::ProductsController + # # (app/controllers/admin/products_controller.rb) + # resources :products + # end +end diff --git a/config/secrets.yml b/config/secrets.yml new file mode 100644 index 000000000..24dd9f008 --- /dev/null +++ b/config/secrets.yml @@ -0,0 +1,22 @@ +# Be sure to restart your server when you modify this file. + +# Your secret key is used for verifying the integrity of signed cookies. +# If you change this key, all old signed cookies will become invalid! + +# Make sure the secret is at least 30 characters and all random, +# no regular words or you'll be exposed to dictionary attacks. +# You can use `rake secret` to generate a secure secret key. + +# Make sure the secrets in this file are kept private +# if you're sharing your code publicly. + +development: + secret_key_base: 00aaa1f10a69e5e5081c18a369b1ba86e9b7d4458963a25dc33f29fdc50c31588e8b6de3be4af38d3c5b287937dfd6205fb86c7025bad5cf60c8372438ca1076 + +test: + secret_key_base: 68d37be753c3cbef59adb9e3fdd9ef0c5a86bf7abb6ac897e52907c08a7fffd3207dd0429093b458dae86e52e34448337f0c4d02d9a098c11c021dbeb5b2b597 + +# Do not keep production secrets in the repository, +# instead read values from the environment. +production: + secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> diff --git a/db/seeds.rb b/db/seeds.rb new file mode 100644 index 000000000..4edb1e857 --- /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 rake db:seed (or created alongside the db with db:setup). +# +# Examples: +# +# cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }]) +# Mayor.create(name: 'Emanuel', city: cities.first) diff --git a/lib/assets/.keep b/lib/assets/.keep new file mode 100644 index 000000000..e69de29bb 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/public/404.html b/public/404.html new file mode 100644 index 000000000..b612547fc --- /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..a21f82b3b --- /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..061abc587 --- /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/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..3c9c7c01f --- /dev/null +++ b/public/robots.txt @@ -0,0 +1,5 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file +# +# To ban all spiders from the entire site uncomment the next two lines: +# User-agent: * +# Disallow: / diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/.keep b/test/fixtures/.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/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..92e39b2d7 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,10 @@ +ENV['RAILS_ENV'] ||= 'test' +require File.expand_path('../../config/environment', __FILE__) +require 'rails/test_help' + +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/vendor/assets/javascripts/.keep b/vendor/assets/javascripts/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/assets/stylesheets/.keep b/vendor/assets/stylesheets/.keep new file mode 100644 index 000000000..e69de29bb From 69edfedd4c400f35b9ed919b1d94ba28edbcac85 Mon Sep 17 00:00:00 2001 From: Natasha Ewing Date: Mon, 31 Oct 2016 21:36:07 -0700 Subject: [PATCH 02/11] added files for API --- Gemfile | 30 ++++++++++++++++++++ Gemfile.lock | 77 +++++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 91 insertions(+), 16 deletions(-) diff --git a/Gemfile b/Gemfile index 4a7b0acf0..aa1039a70 100644 --- a/Gemfile +++ b/Gemfile @@ -23,6 +23,9 @@ gem 'coffee-rails', '~> 4.1.0' # See https://github.com/rails/execjs#readme for more supported runtimes # gem 'therubyracer', platforms: :ruby +gem 'omniauth' +gem 'omniauth-github' +gem 'faker' # Use jquery as the JavaScript library gem 'jquery-rails' # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks @@ -47,9 +50,15 @@ gem 'httparty' gem 'foundation-rails' +group :production do + gem 'pg' + gem 'rails_12factor' +end + group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console gem 'byebug' + gem 'sqlite3' gem 'dotenv-rails' gem 'better_errors' end @@ -60,4 +69,25 @@ group :development do gem 'dotenv-rails' # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring' + gem 'rails-erd' + gem 'better_errors' + gem 'binding_of_caller' + gem 'pry-rails' +end +gem 'bcrypt', '~> 3.1.7' + +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use Unicorn as the app server +# gem 'unicorn' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' + gem 'simplecov' end diff --git a/Gemfile.lock b/Gemfile.lock index 2c49e4e7f..e165e0e3c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -36,12 +36,10 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) + ansi (1.5.0) arel (6.0.3) awesome_print (1.7.0) - babel-source (5.8.35) - babel-transpiler (0.7.0) - babel-source (>= 4.0, < 6) - execjs (~> 2.0) + bcrypt (3.1.11) better_errors (2.1.1) coderay (>= 1.0.0) erubis (>= 2.6.6) @@ -50,6 +48,7 @@ GEM debug_inspector (>= 0.0.1) builder (3.2.2) byebug (9.0.6) + choice (0.2.0) coderay (1.1.1) coffee-rails (4.1.1) coffee-script (>= 2.2.0) @@ -60,6 +59,7 @@ GEM coffee-script-source (1.10.0) concurrent-ruby (1.0.2) debug_inspector (0.0.2) + docile (1.1.5) dotenv (2.1.1) dotenv-rails (2.1.1) dotenv (= 2.1.1) @@ -68,14 +68,11 @@ GEM execjs (2.7.0) faker (1.6.6) i18n (~> 0.5) - foundation-rails (6.2.4.0) - railties (>= 3.1.0) - sass (>= 3.3.0, < 3.5) - sprockets-es6 (>= 0.9.0) + faraday (0.9.2) + multipart-post (>= 1.2, < 3) globalid (0.3.7) activesupport (>= 4.1.0) - httparty (0.14.0) - multi_xml (>= 0.5.2) + hashie (3.4.6) i18n (0.7.0) jbuilder (2.6.0) activesupport (>= 3.0.0, < 5.1) @@ -88,19 +85,51 @@ GEM railties (>= 3.1.0) turbolinks json (1.8.3) + jwt (1.5.6) loofah (2.0.3) nokogiri (>= 1.5.9) mail (2.6.4) mime-types (>= 1.16, < 4) + method_source (0.8.2) mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mini_portile2 (2.1.0) minitest (5.9.1) + minitest-rails (2.2.1) + minitest (~> 5.7) + railties (~> 4.1) + minitest-reporters (1.1.12) + ansi + builder + minitest (>= 5.0) + ruby-progressbar multi_json (1.12.1) multi_xml (0.5.5) + multipart-post (2.0.0) nokogiri (1.6.8.1) mini_portile2 (~> 2.1.0) + oauth2 (1.2.0) + faraday (>= 0.8, < 0.10) + jwt (~> 1.0) + multi_json (~> 1.3) + multi_xml (~> 0.5) + rack (>= 1.2, < 3) + omniauth (1.3.1) + hashie (>= 1.2, < 4) + rack (>= 1.0, < 3) + omniauth-github (1.1.2) + omniauth (~> 1.0) + omniauth-oauth2 (~> 1.1) + omniauth-oauth2 (1.4.0) + oauth2 (~> 1.0) + omniauth (~> 1.2) + pry (0.10.4) + coderay (~> 1.1.0) + method_source (~> 0.8.1) + slop (~> 3.4) + pry-rails (0.3.4) + pry (>= 0.9.10) rack (1.6.4) rack-test (0.6.3) rack (>= 1.0) @@ -121,6 +150,11 @@ GEM activesupport (>= 4.2.0.beta, < 5.0) nokogiri (~> 1.6.0) rails-deprecated_sanitizer (>= 1.0.1) + rails-erd (1.5.0) + activerecord (>= 3.2) + activesupport (>= 3.2) + choice (~> 0.2.0) + ruby-graphviz (~> 1.2) rails-html-sanitizer (1.0.3) loofah (~> 2.0) railties (4.2.7) @@ -131,6 +165,8 @@ GEM rake (11.3.0) rdoc (4.2.2) json (~> 1.4) + ruby-graphviz (1.2.2) + ruby-progressbar (1.8.1) sass (3.4.22) sass-rails (5.0.6) railties (>= 4.0.0, < 6) @@ -141,15 +177,17 @@ GEM sdoc (0.4.2) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) + simplecov (0.12.0) + docile (~> 1.1.0) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.0) + slop (3.6.0) spring (2.0.0) activesupport (>= 4.2) sprockets (3.7.0) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-es6 (0.9.2) - babel-source (>= 5.8.11) - babel-transpiler - sprockets (>= 3.0.0) sprockets-rails (3.2.0) actionpack (>= 4.0) activesupport (>= 4.0) @@ -176,19 +214,26 @@ PLATFORMS DEPENDENCIES awesome_print + bcrypt (~> 3.1.7) better_errors + binding_of_caller byebug coffee-rails (~> 4.1.0) dotenv-rails faker - foundation-rails - httparty jbuilder (~> 2.0) jquery-rails jquery-turbolinks + minitest-rails + minitest-reporters + omniauth + omniauth-github + pry-rails rails (= 4.2.7) + rails-erd sass-rails (~> 5.0) sdoc (~> 0.4.0) + simplecov spring sqlite3 turbolinks From 82594672b5d3c3cbb7e66bafac59f40bedd5aecc Mon Sep 17 00:00:00 2001 From: Natasha Ewing Date: Mon, 31 Oct 2016 21:51:31 -0700 Subject: [PATCH 03/11] just tinkering, reading some docs and making small changes to original setup --- README.md | 68 --------------- app/controllers/RecipesApiController.rb | 18 ++++ config/initializers/session_store.rb | 3 - Gemfile => my_api/Gemfile | 32 -------- Gemfile.lock => my_api/Gemfile.lock | 82 ------------------- README.rdoc => my_api/README.rdoc | 0 Rakefile => my_api/Rakefile | 0 {app => my_api/app}/assets/images/.keep | 0 .../app}/assets/javascripts/application.js | 0 .../app}/assets/stylesheets/application.css | 0 my_api/app/controllers/RecipesController.rb | 18 ++++ .../controllers/application_controller.rb | 0 .../app}/controllers/concerns/.keep | 0 .../app}/helpers/application_helper.rb | 0 {app => my_api/app}/mailers/.keep | 0 {app => my_api/app}/models/.keep | 0 {app => my_api/app}/models/concerns/.keep | 0 .../app}/views/layouts/application.html.erb | 2 +- {bin => my_api/bin}/bundle | 0 {bin => my_api/bin}/rails | 0 {bin => my_api/bin}/rake | 0 {bin => my_api/bin}/setup | 0 {bin => my_api/bin}/spring | 0 config.ru => my_api/config.ru | 0 {config => my_api/config}/application.rb | 4 +- {config => my_api/config}/boot.rb | 0 {config => my_api/config}/database.yml | 0 {config => my_api/config}/environment.rb | 0 .../config}/environments/development.rb | 0 .../config}/environments/production.rb | 0 .../config}/environments/test.rb | 0 .../config}/initializers/assets.rb | 0 .../initializers/backtrace_silencers.rb | 0 .../initializers/cookies_serializer.rb | 0 .../initializers/filter_parameter_logging.rb | 0 .../config}/initializers/inflections.rb | 0 .../config}/initializers/mime_types.rb | 0 my_api/config/initializers/session_store.rb | 3 + .../config}/initializers/wrap_parameters.rb | 0 {config => my_api/config}/locales/en.yml | 0 {config => my_api/config}/routes.rb | 0 {config => my_api/config}/secrets.yml | 4 +- {db => my_api/db}/seeds.rb | 0 {lib => my_api/lib}/assets/.keep | 0 {lib => my_api/lib}/tasks/.keep | 0 {log => my_api/log}/.keep | 0 {public => my_api/public}/404.html | 0 {public => my_api/public}/422.html | 0 {public => my_api/public}/500.html | 0 {public => my_api/public}/favicon.ico | 0 {public => my_api/public}/robots.txt | 0 {test => my_api/test}/controllers/.keep | 0 {test => my_api/test}/fixtures/.keep | 0 {test => my_api/test}/helpers/.keep | 0 {test => my_api/test}/integration/.keep | 0 {test => my_api/test}/mailers/.keep | 0 {test => my_api/test}/models/.keep | 0 {test => my_api/test}/test_helper.rb | 0 .../vendor}/assets/javascripts/.keep | 0 .../vendor}/assets/stylesheets/.keep | 0 60 files changed, 44 insertions(+), 190 deletions(-) delete mode 100644 README.md create mode 100644 app/controllers/RecipesApiController.rb delete mode 100644 config/initializers/session_store.rb rename Gemfile => my_api/Gemfile (76%) rename Gemfile.lock => my_api/Gemfile.lock (68%) rename README.rdoc => my_api/README.rdoc (100%) rename Rakefile => my_api/Rakefile (100%) rename {app => my_api/app}/assets/images/.keep (100%) rename {app => my_api/app}/assets/javascripts/application.js (100%) rename {app => my_api/app}/assets/stylesheets/application.css (100%) create mode 100644 my_api/app/controllers/RecipesController.rb rename {app => my_api/app}/controllers/application_controller.rb (100%) rename {app => my_api/app}/controllers/concerns/.keep (100%) rename {app => my_api/app}/helpers/application_helper.rb (100%) rename {app => my_api/app}/mailers/.keep (100%) rename {app => my_api/app}/models/.keep (100%) rename {app => my_api/app}/models/concerns/.keep (100%) rename {app => my_api/app}/views/layouts/application.html.erb (90%) rename {bin => my_api/bin}/bundle (100%) rename {bin => my_api/bin}/rails (100%) rename {bin => my_api/bin}/rake (100%) rename {bin => my_api/bin}/setup (100%) rename {bin => my_api/bin}/spring (100%) rename config.ru => my_api/config.ru (100%) rename {config => my_api/config}/application.rb (94%) rename {config => my_api/config}/boot.rb (100%) rename {config => my_api/config}/database.yml (100%) rename {config => my_api/config}/environment.rb (100%) rename {config => my_api/config}/environments/development.rb (100%) rename {config => my_api/config}/environments/production.rb (100%) rename {config => my_api/config}/environments/test.rb (100%) rename {config => my_api/config}/initializers/assets.rb (100%) rename {config => my_api/config}/initializers/backtrace_silencers.rb (100%) rename {config => my_api/config}/initializers/cookies_serializer.rb (100%) rename {config => my_api/config}/initializers/filter_parameter_logging.rb (100%) rename {config => my_api/config}/initializers/inflections.rb (100%) rename {config => my_api/config}/initializers/mime_types.rb (100%) create mode 100644 my_api/config/initializers/session_store.rb rename {config => my_api/config}/initializers/wrap_parameters.rb (100%) rename {config => my_api/config}/locales/en.yml (100%) rename {config => my_api/config}/routes.rb (100%) rename {config => my_api/config}/secrets.yml (69%) rename {db => my_api/db}/seeds.rb (100%) rename {lib => my_api/lib}/assets/.keep (100%) rename {lib => my_api/lib}/tasks/.keep (100%) rename {log => my_api/log}/.keep (100%) rename {public => my_api/public}/404.html (100%) rename {public => my_api/public}/422.html (100%) rename {public => my_api/public}/500.html (100%) rename {public => my_api/public}/favicon.ico (100%) rename {public => my_api/public}/robots.txt (100%) rename {test => my_api/test}/controllers/.keep (100%) rename {test => my_api/test}/fixtures/.keep (100%) rename {test => my_api/test}/helpers/.keep (100%) rename {test => my_api/test}/integration/.keep (100%) rename {test => my_api/test}/mailers/.keep (100%) rename {test => my_api/test}/models/.keep (100%) rename {test => my_api/test}/test_helper.rb (100%) rename {vendor => my_api/vendor}/assets/javascripts/.keep (100%) rename {vendor => my_api/vendor}/assets/stylesheets/.keep (100%) diff --git a/README.md b/README.md deleted file mode 100644 index afd643dd4..000000000 --- a/README.md +++ /dev/null @@ -1,68 +0,0 @@ -# Recipe API Consumer - -## Learning Goals: -- Configure an API for consumption -- Create authenticated API requests using HTTParty -- Consume JSON responses from an API -- Map response to application-specific data -- Separate API logic from application logic - -## Purpose -Create a web application that will display recipes based on a search term. We will utilize an API from Edamam called the [Recipe Search API](https://developer.edamam.com/edamam-recipe-api). - - -### Baseline -Before you start writing _any_ code: - -- Explore the API documentation to become familiar with the request(s) you can make -- If desired, create a Trello board to manage tasks - -Once you've explored the API docs, this project: - -- requires an individual **branch** and fork -- Use better_errors for debugging purposes -- requires you to create a Rails application - - conform to Rails conventions on naming and inflection - - by using `rails new .` you will create a new rails app _inside_ of the fork folder instead of creating a _new_ folder for your rails app - -**You shall submit a pull request _with a meaningful pull request description_ once you are done with the baseline which shall be merged before moving onto implementing the requirements. _Do not push any additional code until your baseline PR has been merged_** - - -### Detailed Requirements -**Search**: -- The user shall type in a search term that will: - - Make a request to the API using the search term - - Display the results in a list to the user - -**List View**: -- This shall show a **paged** list of recipes for a given search term, _ten at a time_ -- This view shall show the name of the recipe and the corresponding photo -- The view shall have a link from the recipe to a recipe show view - -**Show View**: -- This shall show the details about a given recipe. These details include: - - Name - - Link to the original recipe (opens in a new tab) - - Ingredients - - Dietary information - -**Additional Requirements**: -- One of the things that permits us to use this API, it providing attibution to the API's created. We must provide this somewhere on our site. Example locations include the footer or an about page. - - [Examples from the API site](https://www.dropbox.com/sh/ss34tnh4kyfxkxu/AADNJ_pB7Ou8_MVrYxgM4aQYa?dl=0&preview=Attribution+examples.pdf) -- You must also create tests for your API Wrapper & any classes as well as controller tests using VCR -- Your site must have a **responsive** look and feel, use semantic HTML as well as any grid formatting using Zurb Foundation - -### Important Notes: -- Using this API as a developer limits the number of API calls in a month to 5000. This means that we must try to minimize API calls for testing purposes as much as possible, to ensure you do not exceed this number of API calls in the one week of development we have. - - -### Optional Requirements: -- Keep track of most recent search terms and allow user's to return to those searches -- Implement an OAuth strategy using Google - - Allow users to save recipes to a "favorites" section that they can return to -- Provide checkboxes or other controls to limit the search to options such as: - - Peanut Free - - Soy Free - - High Protein - - Etc - diff --git a/app/controllers/RecipesApiController.rb b/app/controllers/RecipesApiController.rb new file mode 100644 index 000000000..2abc8e358 --- /dev/null +++ b/app/controllers/RecipesApiController.rb @@ -0,0 +1,18 @@ +class RecipesApiController < ApplicationController + def index + @data = RecipesWrapper + end + + def create + RecipesApiWrapper.sendmsg(params[:channel], params[:message]) + redirect_to root_path + end + + def new + @channel_name = params[:channel] + end + + def find + @data = Channel.find + end +end diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb deleted file mode 100644 index 6cc0e03e4..000000000 --- a/config/initializers/session_store.rb +++ /dev/null @@ -1,3 +0,0 @@ -# Be sure to restart your server when you modify this file. - -Rails.application.config.session_store :cookie_store, key: '_api-muncher_session' diff --git a/Gemfile b/my_api/Gemfile similarity index 76% rename from Gemfile rename to my_api/Gemfile index aa1039a70..3349f7a20 100644 --- a/Gemfile +++ b/my_api/Gemfile @@ -1,5 +1,3 @@ - - source 'https://rubygems.org' @@ -23,9 +21,6 @@ gem 'coffee-rails', '~> 4.1.0' # See https://github.com/rails/execjs#readme for more supported runtimes # gem 'therubyracer', platforms: :ruby -gem 'omniauth' -gem 'omniauth-github' -gem 'faker' # Use jquery as the JavaScript library gem 'jquery-rails' # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks @@ -50,15 +45,9 @@ gem 'httparty' gem 'foundation-rails' -group :production do - gem 'pg' - gem 'rails_12factor' -end - group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console gem 'byebug' - gem 'sqlite3' gem 'dotenv-rails' gem 'better_errors' end @@ -69,25 +58,4 @@ group :development do gem 'dotenv-rails' # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring' - gem 'rails-erd' - gem 'better_errors' - gem 'binding_of_caller' - gem 'pry-rails' -end -gem 'bcrypt', '~> 3.1.7' - -# Use ActiveModel has_secure_password -# gem 'bcrypt', '~> 3.1.7' - -# Use Unicorn as the app server -# gem 'unicorn' - -# Use Capistrano for deployment -# gem 'capistrano-rails', group: :development - - -group :test do - gem 'minitest-rails' - gem 'minitest-reporters' - gem 'simplecov' end diff --git a/Gemfile.lock b/my_api/Gemfile.lock similarity index 68% rename from Gemfile.lock rename to my_api/Gemfile.lock index e165e0e3c..c1dccfc10 100644 --- a/Gemfile.lock +++ b/my_api/Gemfile.lock @@ -36,20 +36,11 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - ansi (1.5.0) arel (6.0.3) - awesome_print (1.7.0) - bcrypt (3.1.11) - better_errors (2.1.1) - coderay (>= 1.0.0) - erubis (>= 2.6.6) - rack (>= 0.9.0) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) builder (3.2.2) byebug (9.0.6) - choice (0.2.0) - coderay (1.1.1) coffee-rails (4.1.1) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.1.x) @@ -59,20 +50,10 @@ GEM coffee-script-source (1.10.0) concurrent-ruby (1.0.2) debug_inspector (0.0.2) - docile (1.1.5) - dotenv (2.1.1) - dotenv-rails (2.1.1) - dotenv (= 2.1.1) - railties (>= 4.0, < 5.1) erubis (2.7.0) execjs (2.7.0) - faker (1.6.6) - i18n (~> 0.5) - faraday (0.9.2) - multipart-post (>= 1.2, < 3) globalid (0.3.7) activesupport (>= 4.1.0) - hashie (3.4.6) i18n (0.7.0) jbuilder (2.6.0) activesupport (>= 3.0.0, < 5.1) @@ -81,55 +62,19 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jquery-turbolinks (2.1.0) - railties (>= 3.1.0) - turbolinks json (1.8.3) - jwt (1.5.6) loofah (2.0.3) nokogiri (>= 1.5.9) mail (2.6.4) mime-types (>= 1.16, < 4) - method_source (0.8.2) mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mini_portile2 (2.1.0) minitest (5.9.1) - minitest-rails (2.2.1) - minitest (~> 5.7) - railties (~> 4.1) - minitest-reporters (1.1.12) - ansi - builder - minitest (>= 5.0) - ruby-progressbar multi_json (1.12.1) - multi_xml (0.5.5) - multipart-post (2.0.0) nokogiri (1.6.8.1) mini_portile2 (~> 2.1.0) - oauth2 (1.2.0) - faraday (>= 0.8, < 0.10) - jwt (~> 1.0) - multi_json (~> 1.3) - multi_xml (~> 0.5) - rack (>= 1.2, < 3) - omniauth (1.3.1) - hashie (>= 1.2, < 4) - rack (>= 1.0, < 3) - omniauth-github (1.1.2) - omniauth (~> 1.0) - omniauth-oauth2 (~> 1.1) - omniauth-oauth2 (1.4.0) - oauth2 (~> 1.0) - omniauth (~> 1.2) - pry (0.10.4) - coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - pry-rails (0.3.4) - pry (>= 0.9.10) rack (1.6.4) rack-test (0.6.3) rack (>= 1.0) @@ -150,11 +95,6 @@ GEM activesupport (>= 4.2.0.beta, < 5.0) nokogiri (~> 1.6.0) rails-deprecated_sanitizer (>= 1.0.1) - rails-erd (1.5.0) - activerecord (>= 3.2) - activesupport (>= 3.2) - choice (~> 0.2.0) - ruby-graphviz (~> 1.2) rails-html-sanitizer (1.0.3) loofah (~> 2.0) railties (4.2.7) @@ -165,8 +105,6 @@ GEM rake (11.3.0) rdoc (4.2.2) json (~> 1.4) - ruby-graphviz (1.2.2) - ruby-progressbar (1.8.1) sass (3.4.22) sass-rails (5.0.6) railties (>= 4.0.0, < 6) @@ -177,12 +115,6 @@ GEM sdoc (0.4.2) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) - simplecov (0.12.0) - docile (~> 1.1.0) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) - slop (3.6.0) spring (2.0.0) activesupport (>= 4.2) sprockets (3.7.0) @@ -213,27 +145,13 @@ PLATFORMS ruby DEPENDENCIES - awesome_print - bcrypt (~> 3.1.7) - better_errors - binding_of_caller byebug coffee-rails (~> 4.1.0) - dotenv-rails - faker jbuilder (~> 2.0) jquery-rails - jquery-turbolinks - minitest-rails - minitest-reporters - omniauth - omniauth-github - pry-rails rails (= 4.2.7) - rails-erd sass-rails (~> 5.0) sdoc (~> 0.4.0) - simplecov spring sqlite3 turbolinks diff --git a/README.rdoc b/my_api/README.rdoc similarity index 100% rename from README.rdoc rename to my_api/README.rdoc diff --git a/Rakefile b/my_api/Rakefile similarity index 100% rename from Rakefile rename to my_api/Rakefile diff --git a/app/assets/images/.keep b/my_api/app/assets/images/.keep similarity index 100% rename from app/assets/images/.keep rename to my_api/app/assets/images/.keep diff --git a/app/assets/javascripts/application.js b/my_api/app/assets/javascripts/application.js similarity index 100% rename from app/assets/javascripts/application.js rename to my_api/app/assets/javascripts/application.js diff --git a/app/assets/stylesheets/application.css b/my_api/app/assets/stylesheets/application.css similarity index 100% rename from app/assets/stylesheets/application.css rename to my_api/app/assets/stylesheets/application.css diff --git a/my_api/app/controllers/RecipesController.rb b/my_api/app/controllers/RecipesController.rb new file mode 100644 index 000000000..c9d6f11e8 --- /dev/null +++ b/my_api/app/controllers/RecipesController.rb @@ -0,0 +1,18 @@ +class RecipesController < ApplicationController + def index + @data = RecipesWrapper + end + + def create + RecipesApiWrapper.sendmsg(params[:channel], params[:message]) + redirect_to root_path + end + + def new + @channel_name = params[:channel] + end + + def find + @data = Channel.find + end +end diff --git a/app/controllers/application_controller.rb b/my_api/app/controllers/application_controller.rb similarity index 100% rename from app/controllers/application_controller.rb rename to my_api/app/controllers/application_controller.rb diff --git a/app/controllers/concerns/.keep b/my_api/app/controllers/concerns/.keep similarity index 100% rename from app/controllers/concerns/.keep rename to my_api/app/controllers/concerns/.keep diff --git a/app/helpers/application_helper.rb b/my_api/app/helpers/application_helper.rb similarity index 100% rename from app/helpers/application_helper.rb rename to my_api/app/helpers/application_helper.rb diff --git a/app/mailers/.keep b/my_api/app/mailers/.keep similarity index 100% rename from app/mailers/.keep rename to my_api/app/mailers/.keep diff --git a/app/models/.keep b/my_api/app/models/.keep similarity index 100% rename from app/models/.keep rename to my_api/app/models/.keep diff --git a/app/models/concerns/.keep b/my_api/app/models/concerns/.keep similarity index 100% rename from app/models/concerns/.keep rename to my_api/app/models/concerns/.keep diff --git a/app/views/layouts/application.html.erb b/my_api/app/views/layouts/application.html.erb similarity index 90% rename from app/views/layouts/application.html.erb rename to my_api/app/views/layouts/application.html.erb index 237dbba45..72e43b3d2 100644 --- a/app/views/layouts/application.html.erb +++ b/my_api/app/views/layouts/application.html.erb @@ -1,7 +1,7 @@ - ApiMuncher + MyApi <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %> <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %> <%= csrf_meta_tags %> diff --git a/bin/bundle b/my_api/bin/bundle similarity index 100% rename from bin/bundle rename to my_api/bin/bundle diff --git a/bin/rails b/my_api/bin/rails similarity index 100% rename from bin/rails rename to my_api/bin/rails diff --git a/bin/rake b/my_api/bin/rake similarity index 100% rename from bin/rake rename to my_api/bin/rake diff --git a/bin/setup b/my_api/bin/setup similarity index 100% rename from bin/setup rename to my_api/bin/setup diff --git a/bin/spring b/my_api/bin/spring similarity index 100% rename from bin/spring rename to my_api/bin/spring diff --git a/config.ru b/my_api/config.ru similarity index 100% rename from config.ru rename to my_api/config.ru diff --git a/config/application.rb b/my_api/config/application.rb similarity index 94% rename from config/application.rb rename to my_api/config/application.rb index 20568697a..86fc0d47a 100644 --- a/config/application.rb +++ b/my_api/config/application.rb @@ -6,7 +6,7 @@ # you've limited to :test, :development, or :production. Bundler.require(*Rails.groups) -module ApiMuncher +module MyApi class Application < Rails::Application # Settings in config/environments/* take precedence over those specified here. # Application configuration should go into files in config/initializers @@ -19,7 +19,7 @@ class Application < Rails::Application # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] # config.i18n.default_locale = :de - + config.autoload_paths << Rails.root.join('lib') # Do not swallow errors in after_commit/after_rollback callbacks. config.active_record.raise_in_transactional_callbacks = true end diff --git a/config/boot.rb b/my_api/config/boot.rb similarity index 100% rename from config/boot.rb rename to my_api/config/boot.rb diff --git a/config/database.yml b/my_api/config/database.yml similarity index 100% rename from config/database.yml rename to my_api/config/database.yml diff --git a/config/environment.rb b/my_api/config/environment.rb similarity index 100% rename from config/environment.rb rename to my_api/config/environment.rb diff --git a/config/environments/development.rb b/my_api/config/environments/development.rb similarity index 100% rename from config/environments/development.rb rename to my_api/config/environments/development.rb diff --git a/config/environments/production.rb b/my_api/config/environments/production.rb similarity index 100% rename from config/environments/production.rb rename to my_api/config/environments/production.rb diff --git a/config/environments/test.rb b/my_api/config/environments/test.rb similarity index 100% rename from config/environments/test.rb rename to my_api/config/environments/test.rb diff --git a/config/initializers/assets.rb b/my_api/config/initializers/assets.rb similarity index 100% rename from config/initializers/assets.rb rename to my_api/config/initializers/assets.rb diff --git a/config/initializers/backtrace_silencers.rb b/my_api/config/initializers/backtrace_silencers.rb similarity index 100% rename from config/initializers/backtrace_silencers.rb rename to my_api/config/initializers/backtrace_silencers.rb diff --git a/config/initializers/cookies_serializer.rb b/my_api/config/initializers/cookies_serializer.rb similarity index 100% rename from config/initializers/cookies_serializer.rb rename to my_api/config/initializers/cookies_serializer.rb diff --git a/config/initializers/filter_parameter_logging.rb b/my_api/config/initializers/filter_parameter_logging.rb similarity index 100% rename from config/initializers/filter_parameter_logging.rb rename to my_api/config/initializers/filter_parameter_logging.rb diff --git a/config/initializers/inflections.rb b/my_api/config/initializers/inflections.rb similarity index 100% rename from config/initializers/inflections.rb rename to my_api/config/initializers/inflections.rb diff --git a/config/initializers/mime_types.rb b/my_api/config/initializers/mime_types.rb similarity index 100% rename from config/initializers/mime_types.rb rename to my_api/config/initializers/mime_types.rb diff --git a/my_api/config/initializers/session_store.rb b/my_api/config/initializers/session_store.rb new file mode 100644 index 000000000..1125c19e4 --- /dev/null +++ b/my_api/config/initializers/session_store.rb @@ -0,0 +1,3 @@ +# Be sure to restart your server when you modify this file. + +Rails.application.config.session_store :cookie_store, key: '_my_api_session' diff --git a/config/initializers/wrap_parameters.rb b/my_api/config/initializers/wrap_parameters.rb similarity index 100% rename from config/initializers/wrap_parameters.rb rename to my_api/config/initializers/wrap_parameters.rb diff --git a/config/locales/en.yml b/my_api/config/locales/en.yml similarity index 100% rename from config/locales/en.yml rename to my_api/config/locales/en.yml diff --git a/config/routes.rb b/my_api/config/routes.rb similarity index 100% rename from config/routes.rb rename to my_api/config/routes.rb diff --git a/config/secrets.yml b/my_api/config/secrets.yml similarity index 69% rename from config/secrets.yml rename to my_api/config/secrets.yml index 24dd9f008..0cedbecb2 100644 --- a/config/secrets.yml +++ b/my_api/config/secrets.yml @@ -11,10 +11,10 @@ # if you're sharing your code publicly. development: - secret_key_base: 00aaa1f10a69e5e5081c18a369b1ba86e9b7d4458963a25dc33f29fdc50c31588e8b6de3be4af38d3c5b287937dfd6205fb86c7025bad5cf60c8372438ca1076 + secret_key_base: b3292f60667236039097995755e068b2d0bc0daf88087c3cdbe71fcf1fca180f5b9aaf8bd24bc133c13d80a318c61de3e361c18b41485f25fccbb7f83d4b359e test: - secret_key_base: 68d37be753c3cbef59adb9e3fdd9ef0c5a86bf7abb6ac897e52907c08a7fffd3207dd0429093b458dae86e52e34448337f0c4d02d9a098c11c021dbeb5b2b597 + secret_key_base: b91048b22405fa6ba1475fd770a655136025e39672ca38058e495572987469a97a22440f3132cb5074767c2e693ebd39bbebbe2f85acdc81fd001c78e54e39c8 # Do not keep production secrets in the repository, # instead read values from the environment. diff --git a/db/seeds.rb b/my_api/db/seeds.rb similarity index 100% rename from db/seeds.rb rename to my_api/db/seeds.rb diff --git a/lib/assets/.keep b/my_api/lib/assets/.keep similarity index 100% rename from lib/assets/.keep rename to my_api/lib/assets/.keep diff --git a/lib/tasks/.keep b/my_api/lib/tasks/.keep similarity index 100% rename from lib/tasks/.keep rename to my_api/lib/tasks/.keep diff --git a/log/.keep b/my_api/log/.keep similarity index 100% rename from log/.keep rename to my_api/log/.keep diff --git a/public/404.html b/my_api/public/404.html similarity index 100% rename from public/404.html rename to my_api/public/404.html diff --git a/public/422.html b/my_api/public/422.html similarity index 100% rename from public/422.html rename to my_api/public/422.html diff --git a/public/500.html b/my_api/public/500.html similarity index 100% rename from public/500.html rename to my_api/public/500.html diff --git a/public/favicon.ico b/my_api/public/favicon.ico similarity index 100% rename from public/favicon.ico rename to my_api/public/favicon.ico diff --git a/public/robots.txt b/my_api/public/robots.txt similarity index 100% rename from public/robots.txt rename to my_api/public/robots.txt diff --git a/test/controllers/.keep b/my_api/test/controllers/.keep similarity index 100% rename from test/controllers/.keep rename to my_api/test/controllers/.keep diff --git a/test/fixtures/.keep b/my_api/test/fixtures/.keep similarity index 100% rename from test/fixtures/.keep rename to my_api/test/fixtures/.keep diff --git a/test/helpers/.keep b/my_api/test/helpers/.keep similarity index 100% rename from test/helpers/.keep rename to my_api/test/helpers/.keep diff --git a/test/integration/.keep b/my_api/test/integration/.keep similarity index 100% rename from test/integration/.keep rename to my_api/test/integration/.keep diff --git a/test/mailers/.keep b/my_api/test/mailers/.keep similarity index 100% rename from test/mailers/.keep rename to my_api/test/mailers/.keep diff --git a/test/models/.keep b/my_api/test/models/.keep similarity index 100% rename from test/models/.keep rename to my_api/test/models/.keep diff --git a/test/test_helper.rb b/my_api/test/test_helper.rb similarity index 100% rename from test/test_helper.rb rename to my_api/test/test_helper.rb diff --git a/vendor/assets/javascripts/.keep b/my_api/vendor/assets/javascripts/.keep similarity index 100% rename from vendor/assets/javascripts/.keep rename to my_api/vendor/assets/javascripts/.keep diff --git a/vendor/assets/stylesheets/.keep b/my_api/vendor/assets/stylesheets/.keep similarity index 100% rename from vendor/assets/stylesheets/.keep rename to my_api/vendor/assets/stylesheets/.keep From 9311c83e170604d75195017e9f31080551551833 Mon Sep 17 00:00:00 2001 From: Natasha Ewing Date: Mon, 31 Oct 2016 22:30:56 -0700 Subject: [PATCH 04/11] deleted repeat files --- .gitignore | 2 ++ my_api/app/views/recipes/index.html.erb | 32 +++++++++++++++++++ my_api/lib/edamam_wrapper.rb | 41 +++++++++++++++++++++++++ 3 files changed, 75 insertions(+) create mode 100644 my_api/app/views/recipes/index.html.erb create mode 100644 my_api/lib/edamam_wrapper.rb diff --git a/.gitignore b/.gitignore index 050c9d95c..eb08c0828 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,5 @@ /log/* !/log/.keep /tmp +.env +.gitignore diff --git a/my_api/app/views/recipes/index.html.erb b/my_api/app/views/recipes/index.html.erb new file mode 100644 index 000000000..322dd3239 --- /dev/null +++ b/my_api/app/views/recipes/index.html.erb @@ -0,0 +1,32 @@ +

Ada Channels

+ +

Your Recipes

+<% if flash[:notice] %> +

<%= flash[:notice] %>

+<% end %> +
+<% sections = ['
', + '
', + '
'] %> + +<% counter = 0 %> +<% max = @data.length / 3 + 1 %> +<% @data.each do |data| %> + <% if counter % max == 0 %> + <%= sections[counter / max].html_safe %> +
    + <% end %> + <% counter += 1 %> +
  • <%= link_to data.name, new_message_path(data.name, data.id) %>
    • + + <% if counter % max == 0 %> +
+
+ <% end %> +<% end %> + <% if counter % max != 0 %> + +
+<% end %> + +
diff --git a/my_api/lib/edamam_wrapper.rb b/my_api/lib/edamam_wrapper.rb new file mode 100644 index 000000000..a81ea35bc --- /dev/null +++ b/my_api/lib/edamam_wrapper.rb @@ -0,0 +1,41 @@ +require 'httparty' + +class EdamamApiWrapper + BASE_URL = "https://api.edamam.com/search" + ESP_BASE_URL = "https://api.edamam.com/search" + TOKEN = ENV["TOKEN"] + + def self.listrecipes() + unless english == false + BASE_URL = ESP_BASE_URL + url = BASE_URL + "recipes" + "token=#{TOKEN}" + "&pretty=1&exclude_archived=1" + data = HTTParty.get(url) + recipe_list = [] + if data["recipes"] + data["recipes"].each do |recipe| + wrapper = Recipe.new recipe["name"], recipe["id"] , purpose: recipe["purpose"], is_archived: recipe["is_archived"], members: recipe["members"] + recipe_list << wrapper + end + end + end + #return array of ruby objects rather than a hash of non-parsed data + return recipe_list + end + + def self.sendmsg(recipe, msg, token = nil) + token = TOKEN if token == nil + puts "Sending message to recipe #{recipe}: #{msg}" + url = BASE_URL + "chat.postMessage?" + "token=#{TOKEN}" + data = HTTParty.post(url, + #just one way of setting up the hash.. text, recipe required; others chosen + body: { + "text" => "#{msg}", + "recipe" => "#{recipe}", + "username" => "Roberts-Robit", + "icon_emoji" => ":robot_face:", + "as_user" => "false" + }, + :headers => { 'Content-Type' => 'application/x-www-form-urlencoded' }) + data + end +end From 5382698055a44245f727cc6fe7bb7d196a07d113 Mon Sep 17 00:00:00 2001 From: Natasha Ewing Date: Tue, 1 Nov 2016 10:03:10 -0700 Subject: [PATCH 05/11] had another file to remove, worked a tiny bit on methods --- app/controllers/RecipesApiController.rb | 18 ------------------ my_api/.gitignore | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 18 deletions(-) delete mode 100644 app/controllers/RecipesApiController.rb create mode 100644 my_api/.gitignore diff --git a/app/controllers/RecipesApiController.rb b/app/controllers/RecipesApiController.rb deleted file mode 100644 index 2abc8e358..000000000 --- a/app/controllers/RecipesApiController.rb +++ /dev/null @@ -1,18 +0,0 @@ -class RecipesApiController < ApplicationController - def index - @data = RecipesWrapper - end - - def create - RecipesApiWrapper.sendmsg(params[:channel], params[:message]) - redirect_to root_path - end - - def new - @channel_name = params[:channel] - end - - def find - @data = Channel.find - end -end diff --git a/my_api/.gitignore b/my_api/.gitignore new file mode 100644 index 000000000..72dcca089 --- /dev/null +++ b/my_api/.gitignore @@ -0,0 +1,18 @@ +# 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 the default SQLite database. +/db/*.sqlite3 +/db/*.sqlite3-journal + +# Ignore all logfiles and tempfiles. +/log/* +!/log/.keep +/tmp +.env From 4cd3ffabecd9563d45a24c3c4597fe26912ef1e0 Mon Sep 17 00:00:00 2001 From: Natasha Ewing Date: Tue, 1 Nov 2016 14:03:16 -0700 Subject: [PATCH 06/11] progress tuesday: added test files, working on methods for wrapper and controllers --- my_api/app/controllers/RecipesController.rb | 29 ++++++++++++++-- .../app/controllers/application_controller.rb | 1 + my_api/app/views/recipes/index.html.erb | 5 +++ my_api/config/application.rb | 3 ++ my_api/config/initializers/mime_types.rb | 6 ++++ my_api/config/routes.rb | 3 ++ my_api/lib/edamam_wrapper.rb | 34 ++++++++++++------- my_api/lib/recipe.rb | 6 ++++ my_api/test/lib/edamam_wrapper_test.rb | 0 my_api/test/lib/recipe_test.rb | 0 my_api/test/test_helper.rb | 14 ++++++++ 11 files changed, 85 insertions(+), 16 deletions(-) create mode 100644 my_api/lib/recipe.rb create mode 100644 my_api/test/lib/edamam_wrapper_test.rb create mode 100644 my_api/test/lib/recipe_test.rb diff --git a/my_api/app/controllers/RecipesController.rb b/my_api/app/controllers/RecipesController.rb index c9d6f11e8..4db27eef6 100644 --- a/my_api/app/controllers/RecipesController.rb +++ b/my_api/app/controllers/RecipesController.rb @@ -1,18 +1,41 @@ class RecipesController < ApplicationController def index - @data = RecipesWrapper + @data = Recipes.all end def create - RecipesApiWrapper.sendmsg(params[:channel], params[:message]) + RecipesApiWrapper.search(params[:q], params[:message]) redirect_to root_path end def new - @channel_name = params[:channel] + @channel_name = params[:q] end def find @data = Channel.find end end + + + def create + result = Channel.by_name(params[:channel]).sendmsg(params[:message]) + if result["ok"] + flash[:notice] = "Successfully sent message to #{params[:channel]}" + else + flash[:notice] = "Failed to send message to #{params[:channel]}: #{result["error"]}" + end + redirect_to homepages_index_path + end + + def new + @channel_name = params[:channel] + end +end + + +private + +def product_params + params.require(:q).permit(:health, :diet, :calories) + end diff --git a/my_api/app/controllers/application_controller.rb b/my_api/app/controllers/application_controller.rb index d83690e1b..2ec37e2e0 100644 --- a/my_api/app/controllers/application_controller.rb +++ b/my_api/app/controllers/application_controller.rb @@ -2,4 +2,5 @@ class ApplicationController < ActionController::Base # Prevent CSRF attacks by raising an exception. # For APIs, you may want to use :null_session instead. protect_from_forgery with: :exception + end diff --git a/my_api/app/views/recipes/index.html.erb b/my_api/app/views/recipes/index.html.erb index 322dd3239..f59b42bb8 100644 --- a/my_api/app/views/recipes/index.html.erb +++ b/my_api/app/views/recipes/index.html.erb @@ -28,5 +28,10 @@
<% end %> +
+<% sections = ['
', + '
', + '
'] %> +<%if spanish_path %>
diff --git a/my_api/config/application.rb b/my_api/config/application.rb index 86fc0d47a..bb8484683 100644 --- a/my_api/config/application.rb +++ b/my_api/config/application.rb @@ -8,6 +8,9 @@ module MyApi class Application < Rails::Application + config.middleware.use Rack::Deflater + end +end # Settings in config/environments/* take precedence over those specified here. # Application configuration should go into files in config/initializers # -- all .rb files in that directory are automatically loaded. diff --git a/my_api/config/initializers/mime_types.rb b/my_api/config/initializers/mime_types.rb index dc1899682..526a89319 100644 --- a/my_api/config/initializers/mime_types.rb +++ b/my_api/config/initializers/mime_types.rb @@ -2,3 +2,9 @@ # Add new mime types for use in respond_to blocks: # Mime::Type.register "text/richtext", :rtf +Mime::Type.register "gizp/json", :gzipjson + +ActionDispatch::ParamsParser::DEFAULT_PARSERS[Mime::Type.lookup('gzip/json')]=lambda do |raw_body| + body = ActiveSupport::Gzip.decompress(raw_body) + JSON.parse(body).with_indifferent_access +end diff --git a/my_api/config/routes.rb b/my_api/config/routes.rb index 3f66539d5..219782355 100644 --- a/my_api/config/routes.rb +++ b/my_api/config/routes.rb @@ -1,4 +1,7 @@ Rails.application.routes.draw do + root 'recipequery' + get 'recipequery/index', to: 'recipequery#index' + get 'recipequery/show/:id', to: 'recipequery#show' # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". diff --git a/my_api/lib/edamam_wrapper.rb b/my_api/lib/edamam_wrapper.rb index a81ea35bc..6194e432b 100644 --- a/my_api/lib/edamam_wrapper.rb +++ b/my_api/lib/edamam_wrapper.rb @@ -5,35 +5,43 @@ class EdamamApiWrapper ESP_BASE_URL = "https://api.edamam.com/search" TOKEN = ENV["TOKEN"] - def self.listrecipes() - unless english == false - BASE_URL = ESP_BASE_URL - url = BASE_URL + "recipes" + "token=#{TOKEN}" + "&pretty=1&exclude_archived=1" + def self.listrecipes(query) + + url = BASE_URL + "?#{query}" + "app_id=#{ID}" + "&app_key=#{TOKEN}" data = HTTParty.get(url) recipe_list = [] if data["recipes"] data["recipes"].each do |recipe| - wrapper = Recipe.new recipe["name"], recipe["id"] , purpose: recipe["purpose"], is_archived: recipe["is_archived"], members: recipe["members"] + wrapper = Recipe.new recipe["token"],recipe["id"], q: recipe["label"], recipe["image"], recipe["ingredients"], recipe["dietLabels"], recipe["healthLabels"] recipe_list << wrapper end end - end #return array of ruby objects rather than a hash of non-parsed data return recipe_list end + def self.list_esp_recipes() + url = ESP_BASE_URL + "?#{q}" + "app_id=$#{ID}" + "&app_key=$#{TOKEN}" + data = HTTParty.get(url) + recipe_list = [] + if data["recipes"] + data["recipes"].each do |recipe| + wrapper = Recipe.new recipe["q"], recipe["id"], is_archived: recipe["is_archived"], members: recipe["members"] + recipe_list << wrapper + end + end + end + def self.sendmsg(recipe, msg, token = nil) token = TOKEN if token == nil - puts "Sending message to recipe #{recipe}: #{msg}" + puts "Search for a recipe #{query_text} : #{search}" url = BASE_URL + "chat.postMessage?" + "token=#{TOKEN}" data = HTTParty.post(url, - #just one way of setting up the hash.. text, recipe required; others chosen + #just one way of setting up the hash.. search, recipe required; others chosen body: { - "text" => "#{msg}", - "recipe" => "#{recipe}", - "username" => "Roberts-Robit", - "icon_emoji" => ":robot_face:", - "as_user" => "false" + "query_text" => "#{query_text}", + "q" => "#{q}", + "label" => "false", }, :headers => { 'Content-Type' => 'application/x-www-form-urlencoded' }) data diff --git a/my_api/lib/recipe.rb b/my_api/lib/recipe.rb new file mode 100644 index 000000000..ce0a7e8ee --- /dev/null +++ b/my_api/lib/recipe.rb @@ -0,0 +1,6 @@ +class Recipe < ActiveRecord::Base + def self.search(query) + query = "%#{query}%" + Product.where("name LIKE ? OR description LIKE ?", query, query) + end +end diff --git a/my_api/test/lib/edamam_wrapper_test.rb b/my_api/test/lib/edamam_wrapper_test.rb new file mode 100644 index 000000000..e69de29bb diff --git a/my_api/test/lib/recipe_test.rb b/my_api/test/lib/recipe_test.rb new file mode 100644 index 000000000..e69de29bb diff --git a/my_api/test/test_helper.rb b/my_api/test/test_helper.rb index 92e39b2d7..1fd77d60a 100644 --- a/my_api/test/test_helper.rb +++ b/my_api/test/test_helper.rb @@ -1,10 +1,24 @@ ENV['RAILS_ENV'] ||= 'test' require File.expand_path('../../config/environment', __FILE__) require 'rails/test_help' +require "minitest/reporters" +require 'vcr' +require 'webmock/minitest' + +VCR.configure do |config| + config.cassette_library_dir = 'test/cassettes' # folder where casettes will be located + config.hook_into :webmock # tie into this other tool called webmock + config.default_cassette_options = { + :record => :new_episodes, # record new data when we don't have it yet + :match_requests_on => [:method, :uri, :body] # The http method, URI and body of a request all need to match + } +end + 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... + Minitest::Reporters.use! # use Minitest Reporters for colored output. end From 8ddaec923ae98d416a6e505eee08bfc1d670febb Mon Sep 17 00:00:00 2001 From: Natasha Ewing Date: Wed, 2 Nov 2016 10:47:06 -0700 Subject: [PATCH 07/11] updated gem file, debugging problems with bundle install --- my_api/Gemfile | 12 +- my_api/app/assets/stylesheets/application.css | 15 --- .../app/assets/stylesheets/application.scss | 113 ++++++++++++++++++ my_api/app/views/layouts/application.html.erb | 68 +++++++++-- my_api/app/views/recipes/show.html.erb | 0 my_api/app/views/welcome/index.html.erb | 22 ++++ my_api/app/views/welcome/show.html.erb | 0 my_api/bin/bundle | 3 + my_api/config/routes.rb | 2 +- my_api/lib/edamam_wrapper.rb | 6 +- 10 files changed, 213 insertions(+), 28 deletions(-) delete mode 100644 my_api/app/assets/stylesheets/application.css create mode 100644 my_api/app/assets/stylesheets/application.scss create mode 100644 my_api/app/views/recipes/show.html.erb create mode 100644 my_api/app/views/welcome/index.html.erb create mode 100644 my_api/app/views/welcome/show.html.erb diff --git a/my_api/Gemfile b/my_api/Gemfile index 3349f7a20..624ba0d54 100644 --- a/my_api/Gemfile +++ b/my_api/Gemfile @@ -50,12 +50,22 @@ group :development, :test do gem 'byebug' gem 'dotenv-rails' gem 'better_errors' + gem 'minitest-vcr' + gem 'webmock' + end group :development do # Access an IRB console on exception pages or by using <%= console %> in views gem 'web-console', '~> 2.0' - gem 'dotenv-rails' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring' + + # Use pry for rails console + gem 'pry-rails' +end + +group :test do + gem 'minitest-reporters' end diff --git a/my_api/app/assets/stylesheets/application.css b/my_api/app/assets/stylesheets/application.css deleted file mode 100644 index f9cd5b348..000000000 --- a/my_api/app/assets/stylesheets/application.css +++ /dev/null @@ -1,15 +0,0 @@ -/* - * This is a manifest file that'll be compiled into application.css, which will include all the files - * listed below. - * - * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, - * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path. - * - * You're free to add application-wide styles to this file and they'll appear at the bottom of the - * compiled file so the styles you add here take precedence over styles defined in any styles - * defined in the other CSS/SCSS files in this directory. It is generally better to create a new - * file per style scope. - * - *= require_tree . - *= require_self - */ diff --git a/my_api/app/assets/stylesheets/application.scss b/my_api/app/assets/stylesheets/application.scss new file mode 100644 index 000000000..c91b644d8 --- /dev/null +++ b/my_api/app/assets/stylesheets/application.scss @@ -0,0 +1,113 @@ +/* + * This is a manifest file that'll be compiled into application.css, which will include all the files + * listed below. + * + * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, + * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path. + * + * You're free to add application-wide styles to this file and they'll appear at the bottom of the + * compiled file so the styles you add here take precedence over styles defined in any styles + * defined in the other CSS/SCSS files in this directory. It is generally better to create a new + * file per style scope. + * + *= require_tree . + *= require_self + //= require foundation_and_overrides + */ + h1, h2, h3, h4, h5, p{ + font: italic bold 20px Georgia, serif; + + } + h1,a{ + font: italic bold 20px Georgia, serif; + display: inline-grid; + } + + img.thumbnail{ + display: inline-block; + align-items: center; + width: 200px; + height: 220px; + border: solid 3px navy; + } + h1.AllList{ + background-color: deepskyblue; + font: italic bold 12px/20px Georgia, serif; + width: 100%; + } + .footer{ + background-color: deepskyblue; + content-align: center; + font-color: #D8D16F; + width: 100%; + height: 100%; + border-width: medium; + } + a.button { + margin-left: 5%; + margin-right: 4%; + align-items: center; + padding: 20px; + font-size: 1em; + white-space: nowrap; + display: inline-grid; + background-color: deepskyblue; + font: italic 12px Georgia; + } + + div.top-bar:hover, a.button:hover{ + text-decoration: none; + list-style-type: none; + background-color: navy; + } + + .errors { + color: aqua; + } + + div.callout.small{ + content-align: center; + border-color: #D8D16F; + border-width: medium; + } + + div.row.column{ + font: italic bold 12px/20px Georgia, serif; + width:100%; + display: inline-grid; + text-decoration: none; + list-style-type: none; + } + + h1.row.text-center, h2.row.text-center, h3.subheader{ + font: italic 35px Georgia, serif; + } + + div.top-bar, a.button{ + background-color: deepskyblue; + text-decoration: none; + list-style-type: none; + padding: 15px, 8px; + text-align: justify; + display: inline-grid; + background-color: deepskyblue; + } + + ul.menu{ + border-style: solid; + font: italic bold 12px/20px Georgia, serif; + display: inline-grid; + padding: 20px, 40px; + background-color: deepskyblue; + content-align: center; + border-color: #D8D16F; + border-width: medium; + margin: 10px; + } + + .container, .body{ + font: italic bold 12px/20px Georgia, serif; + width: 100%; + text-decoration: none; + list-style-type: none; + } diff --git a/my_api/app/views/layouts/application.html.erb b/my_api/app/views/layouts/application.html.erb index 72e43b3d2..ea11a49d4 100644 --- a/my_api/app/views/layouts/application.html.erb +++ b/my_api/app/views/layouts/application.html.erb @@ -1,14 +1,66 @@ - + - MyApi - <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %> - <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %> + + + <%= stylesheet_link_tag "application" %> + <%= javascript_include_tag "application", 'data-turbolinks-track' => true %> <%= csrf_meta_tags %> - -<%= yield %> + +
+ + + <%= yield %> + + + + +
+
+ +
+ <% Time.zone = "Pacific Time (US & Canada)" %> ThinkieDrinkieProductions © <%= copyright_notice_year_range(2016) %> All Rights Reserved. + <%= login_status %> +
+
+
+
+ + diff --git a/my_api/app/views/recipes/show.html.erb b/my_api/app/views/recipes/show.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/my_api/app/views/welcome/index.html.erb b/my_api/app/views/welcome/index.html.erb new file mode 100644 index 000000000..01ee5b63d --- /dev/null +++ b/my_api/app/views/welcome/index.html.erb @@ -0,0 +1,22 @@ +
+
+
+ + <%= link_to "Browse Products List by Seller", users_path, method: :get, class: "button"%> + + <%= link_to "Browse Products by Category", categories_path, method: :get, class: "button"%> + + <%= link_to "Our Most Popular Products", popular_path, method: :get, class: "button"%> + +
+
+ +
+ <% @products.each do |products| %> +
+
  • <%=image_tag recipes.image, rwidth: '150', rheight: '150'%>
    • + <%=link_to "Take a peak", recipe_path(recipe.id), method: :get, class:"button small expanded hollow"%> +
    + <% end %> +
    +
    diff --git a/my_api/app/views/welcome/show.html.erb b/my_api/app/views/welcome/show.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/my_api/bin/bundle b/my_api/bin/bundle index 66e9889e8..04e9974fd 100755 --- a/my_api/bin/bundle +++ b/my_api/bin/bundle @@ -1,3 +1,6 @@ #!/usr/bin/env ruby ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) load Gem.bin_path('bundler', 'bundle') +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) +load Gem.bin_path('bundler', 'bundle') diff --git a/my_api/config/routes.rb b/my_api/config/routes.rb index 219782355..c0c1462b7 100644 --- a/my_api/config/routes.rb +++ b/my_api/config/routes.rb @@ -1,5 +1,5 @@ Rails.application.routes.draw do - root 'recipequery' + root 'welcome/index', to: 'welcome#index' as: 'home' get 'recipequery/index', to: 'recipequery#index' get 'recipequery/show/:id', to: 'recipequery#show' # The priority is based upon order of creation: first created -> highest priority. diff --git a/my_api/lib/edamam_wrapper.rb b/my_api/lib/edamam_wrapper.rb index 6194e432b..9cdcd6375 100644 --- a/my_api/lib/edamam_wrapper.rb +++ b/my_api/lib/edamam_wrapper.rb @@ -20,13 +20,13 @@ def self.listrecipes(query) return recipe_list end - def self.list_esp_recipes() - url = ESP_BASE_URL + "?#{q}" + "app_id=$#{ID}" + "&app_key=$#{TOKEN}" + def self.list_esp_recipes(query) + url = ESP_BASE_URL + "?#{query}" + "app_id=#{ID}" + "&app_key=#{TOKEN}" data = HTTParty.get(url) recipe_list = [] if data["recipes"] data["recipes"].each do |recipe| - wrapper = Recipe.new recipe["q"], recipe["id"], is_archived: recipe["is_archived"], members: recipe["members"] + wrapper = Recipe.new recipe["label"], recipe["image"], is_archived: recipe["url"], members: recipe["members"] recipe_list << wrapper end end From 5626bc5fedbf705556332c1881f8273bee823dcf Mon Sep 17 00:00:00 2001 From: Natasha Ewing Date: Sun, 6 Nov 2016 01:16:42 -0700 Subject: [PATCH 08/11] added app java app.js, .keep, application.scss --- Gemfile | 71 ++++++ Gemfile.lock | 234 ++++++++++++++++++ README.rdoc | 28 +++ Rakefile | 6 + app/assets/images/.keep | 0 app/assets/javascripts/application.js | 16 ++ app/assets/stylesheets/application.scss | 113 +++++++++ app/controllers/RecipesController.rb | 41 +++ app/controllers/application_controller.rb | 5 + app/controllers/concerns/.keep | 0 app/helpers/application_helper.rb | 2 + app/mailers/.keep | 0 app/models/.keep | 0 app/models/concerns/.keep | 0 app/views/layouts/application.html.erb | 66 +++++ app/views/recipes/index.html.erb | 37 +++ app/views/recipes/show.html.erb | 0 app/views/welcome/index.html.erb | 0 app/views/welcome/show.html.erb | 0 bin/bundle | 6 + bin/rails | 9 + bin/rake | 9 + bin/setup | 29 +++ bin/spring | 16 ++ config.ru | 4 + config/application.rb | 28 +++ config/boot.rb | 3 + config/database.yml | 25 ++ config/environment.rb | 5 + config/environments/development.rb | 41 +++ config/environments/production.rb | 79 ++++++ config/environments/test.rb | 42 ++++ config/initializers/assets.rb | 11 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cookies_serializer.rb | 3 + .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 10 + config/initializers/session_store.rb | 3 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 23 ++ config/routes.rb | 61 +++++ config/secrets.yml | 22 ++ db/seeds.rb | 7 + lib/assets/.keep | 0 lib/edamam_wrapper.rb | 49 ++++ lib/recipe.rb | 52 ++++ lib/tasks/.keep | 0 lib/welcome.rb | 6 + log/.keep | 0 my_api/lib/welcome.rb | 6 + public/404.html | 67 +++++ public/422.html | 67 +++++ public/500.html | 66 +++++ public/favicon.ico | 0 public/robots.txt | 5 + test/controllers/.keep | 0 test/fixtures/.keep | 0 test/helpers/.keep | 0 test/integration/.keep | 0 test/lib/edamam_wrapper_test.rb | 0 test/lib/recipe_test.rb | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/test_helper.rb | 24 ++ vendor/assets/javascripts/.keep | 0 vendor/assets/stylesheets/.keep | 0 67 files changed, 1438 insertions(+) create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 README.rdoc create mode 100644 Rakefile create mode 100644 app/assets/images/.keep create mode 100644 app/assets/javascripts/application.js create mode 100644 app/assets/stylesheets/application.scss create mode 100644 app/controllers/RecipesController.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/helpers/application_helper.rb create mode 100644 app/mailers/.keep create mode 100644 app/models/.keep create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/application.html.erb create mode 100644 app/views/recipes/index.html.erb create mode 100644 app/views/recipes/show.html.erb create mode 100644 app/views/welcome/index.html.erb create mode 100644 app/views/welcome/show.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 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb 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/assets.rb create mode 100644 config/initializers/backtrace_silencers.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/session_store.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/routes.rb create mode 100644 config/secrets.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 lib/welcome.rb create mode 100644 log/.keep create mode 100644 my_api/lib/welcome.rb create mode 100644 public/404.html create mode 100644 public/422.html create mode 100644 public/500.html create mode 100644 public/favicon.ico create mode 100644 public/robots.txt create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/helpers/.keep create mode 100644 test/integration/.keep create mode 100644 test/lib/edamam_wrapper_test.rb create mode 100644 test/lib/recipe_test.rb create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/test_helper.rb create mode 100644 vendor/assets/javascripts/.keep create mode 100644 vendor/assets/stylesheets/.keep diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..624ba0d54 --- /dev/null +++ b/Gemfile @@ -0,0 +1,71 @@ +source 'https://rubygems.org' + + +# Required due to an incompatibility between TurboLinks and Foundation. +gem 'jquery-turbolinks' + +gem 'faker' + +gem 'awesome_print' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '4.2.7' +# Use sqlite3 as the database for Active Record +gem 'sqlite3' +# Use SCSS for stylesheets +gem 'sass-rails', '~> 5.0' +# Use Uglifier as compressor for JavaScript assets +gem 'uglifier', '>= 1.3.0' +# Use CoffeeScript for .coffee assets and views +gem 'coffee-rails', '~> 4.1.0' +# See https://github.com/rails/execjs#readme for more supported runtimes +# gem 'therubyracer', platforms: :ruby + +# Use jquery as the JavaScript library +gem 'jquery-rails' +# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks +gem 'turbolinks' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +gem 'jbuilder', '~> 2.0' +# bundle exec rake doc:rails generates the API under doc/api. +gem 'sdoc', '~> 0.4.0', group: :doc + +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use Unicorn as the app server +# gem 'unicorn' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# API GEMS +gem 'httparty' + +gem 'foundation-rails' + + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug' + gem 'dotenv-rails' + gem 'better_errors' + gem 'minitest-vcr' + gem 'webmock' + +end + +group :development do + # Access an IRB console on exception pages or by using <%= console %> in views + gem 'web-console', '~> 2.0' + + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + + # Use pry for rails console + gem 'pry-rails' +end + +group :test do + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..c69f35e5d --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,234 @@ +GEM + remote: https://rubygems.org/ + specs: + actionmailer (4.2.7) + actionpack (= 4.2.7) + actionview (= 4.2.7) + activejob (= 4.2.7) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 1.0, >= 1.0.5) + actionpack (4.2.7) + actionview (= 4.2.7) + activesupport (= 4.2.7) + rack (~> 1.6) + rack-test (~> 0.6.2) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (4.2.7) + activesupport (= 4.2.7) + builder (~> 3.1) + erubis (~> 2.7.0) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + activejob (4.2.7) + activesupport (= 4.2.7) + globalid (>= 0.3.0) + activemodel (4.2.7) + activesupport (= 4.2.7) + builder (~> 3.1) + activerecord (4.2.7) + activemodel (= 4.2.7) + activesupport (= 4.2.7) + arel (~> 6.0) + activesupport (4.2.7) + i18n (~> 0.7) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + addressable (2.4.0) + ansi (1.5.0) + arel (6.0.3) + awesome_print (1.7.0) + babel-source (5.8.35) + babel-transpiler (0.7.0) + babel-source (>= 4.0, < 6) + execjs (~> 2.0) + better_errors (2.1.1) + coderay (>= 1.0.0) + erubis (>= 2.6.6) + rack (>= 0.9.0) + binding_of_caller (0.7.2) + debug_inspector (>= 0.0.1) + builder (3.2.2) + byebug (9.0.6) + coderay (1.1.1) + coffee-rails (4.1.1) + coffee-script (>= 2.2.0) + railties (>= 4.0.0, < 5.1.x) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.10.0) + concurrent-ruby (1.0.2) + crack (0.4.3) + safe_yaml (~> 1.0.0) + debug_inspector (0.0.2) + dotenv (2.1.1) + dotenv-rails (2.1.1) + dotenv (= 2.1.1) + railties (>= 4.0, < 5.1) + erubis (2.7.0) + execjs (2.7.0) + faker (1.6.6) + i18n (~> 0.5) + foundation-rails (6.2.4.0) + railties (>= 3.1.0) + sass (>= 3.3.0, < 3.5) + sprockets-es6 (>= 0.9.0) + globalid (0.3.7) + activesupport (>= 4.1.0) + hashdiff (0.3.0) + httparty (0.14.0) + multi_xml (>= 0.5.2) + i18n (0.7.0) + jbuilder (2.6.0) + activesupport (>= 3.0.0, < 5.1) + multi_json (~> 1.2) + jquery-rails (4.2.1) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + jquery-turbolinks (2.1.0) + railties (>= 3.1.0) + turbolinks + json (1.8.3) + loofah (2.0.3) + nokogiri (>= 1.5.9) + mail (2.6.4) + mime-types (>= 1.16, < 4) + method_source (0.8.2) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mini_portile2 (2.1.0) + minispec-metadata (2.0.0) + minitest + minitest (5.9.1) + minitest-reporters (1.1.12) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + minitest-vcr (1.4.0) + minispec-metadata (~> 2.0) + minitest (>= 4.7.5) + vcr (>= 2.9) + multi_json (1.12.1) + multi_xml (0.5.5) + nokogiri (1.6.8.1) + mini_portile2 (~> 2.1.0) + pry (0.10.4) + coderay (~> 1.1.0) + method_source (~> 0.8.1) + slop (~> 3.4) + pry-rails (0.3.4) + pry (>= 0.9.10) + rack (1.6.4) + rack-test (0.6.3) + rack (>= 1.0) + rails (4.2.7) + actionmailer (= 4.2.7) + actionpack (= 4.2.7) + actionview (= 4.2.7) + activejob (= 4.2.7) + activemodel (= 4.2.7) + activerecord (= 4.2.7) + activesupport (= 4.2.7) + bundler (>= 1.3.0, < 2.0) + railties (= 4.2.7) + sprockets-rails + rails-deprecated_sanitizer (1.0.3) + activesupport (>= 4.2.0.alpha) + rails-dom-testing (1.0.7) + activesupport (>= 4.2.0.beta, < 5.0) + nokogiri (~> 1.6.0) + rails-deprecated_sanitizer (>= 1.0.1) + rails-html-sanitizer (1.0.3) + loofah (~> 2.0) + railties (4.2.7) + actionpack (= 4.2.7) + activesupport (= 4.2.7) + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (11.3.0) + rdoc (4.2.2) + json (~> 1.4) + ruby-progressbar (1.8.1) + safe_yaml (1.0.4) + sass (3.4.22) + sass-rails (5.0.6) + railties (>= 4.0.0, < 6) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + sdoc (0.4.2) + json (~> 1.7, >= 1.7.7) + rdoc (~> 4.0) + slop (3.6.0) + spring (2.0.0) + activesupport (>= 4.2) + sprockets (3.7.0) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-es6 (0.9.2) + babel-source (>= 5.8.11) + babel-transpiler + sprockets (>= 3.0.0) + sprockets-rails (3.2.0) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + sqlite3 (1.3.12) + thor (0.19.1) + thread_safe (0.3.5) + tilt (2.0.5) + turbolinks (5.0.1) + turbolinks-source (~> 5) + turbolinks-source (5.0.0) + tzinfo (1.2.2) + thread_safe (~> 0.1) + uglifier (3.0.3) + execjs (>= 0.3.0, < 3) + vcr (3.0.3) + web-console (2.3.0) + activemodel (>= 4.0) + binding_of_caller (>= 0.7.2) + railties (>= 4.0) + sprockets-rails (>= 2.0, < 4.0) + webmock (2.1.0) + addressable (>= 2.3.6) + crack (>= 0.3.2) + hashdiff + +PLATFORMS + ruby + +DEPENDENCIES + awesome_print + better_errors + byebug + coffee-rails (~> 4.1.0) + dotenv-rails + faker + foundation-rails + httparty + jbuilder (~> 2.0) + jquery-rails + jquery-turbolinks + minitest-reporters + minitest-vcr + pry-rails + rails (= 4.2.7) + sass-rails (~> 5.0) + sdoc (~> 0.4.0) + spring + sqlite3 + turbolinks + uglifier (>= 1.3.0) + web-console (~> 2.0) + webmock + +BUNDLED WITH + 1.13.6 diff --git a/README.rdoc b/README.rdoc new file mode 100644 index 000000000..dd4e97e22 --- /dev/null +++ b/README.rdoc @@ -0,0 +1,28 @@ +== README + +This README would normally document whatever steps are necessary to get the +application up and running. + +Things you may want to cover: + +* Ruby version + +* System dependencies + +* Configuration + +* Database creation + +* Database initialization + +* How to run the test suite + +* Services (job queues, cache servers, search engines, etc.) + +* Deployment instructions + +* ... + + +Please feel free to use a different markup language if you do not plan to run +rake doc:app. diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..ba6b733dd --- /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 File.expand_path('../config/application', __FILE__) + +Rails.application.load_tasks 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..e07c5a830 --- /dev/null +++ b/app/assets/javascripts/application.js @@ -0,0 +1,16 @@ +// 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, vendor/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. +// +// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details +// about supported directives. +// +//= require jquery +//= require jquery_ujs +//= require turbolinks +//= require_tree . diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss new file mode 100644 index 000000000..c91b644d8 --- /dev/null +++ b/app/assets/stylesheets/application.scss @@ -0,0 +1,113 @@ +/* + * This is a manifest file that'll be compiled into application.css, which will include all the files + * listed below. + * + * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, + * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path. + * + * You're free to add application-wide styles to this file and they'll appear at the bottom of the + * compiled file so the styles you add here take precedence over styles defined in any styles + * defined in the other CSS/SCSS files in this directory. It is generally better to create a new + * file per style scope. + * + *= require_tree . + *= require_self + //= require foundation_and_overrides + */ + h1, h2, h3, h4, h5, p{ + font: italic bold 20px Georgia, serif; + + } + h1,a{ + font: italic bold 20px Georgia, serif; + display: inline-grid; + } + + img.thumbnail{ + display: inline-block; + align-items: center; + width: 200px; + height: 220px; + border: solid 3px navy; + } + h1.AllList{ + background-color: deepskyblue; + font: italic bold 12px/20px Georgia, serif; + width: 100%; + } + .footer{ + background-color: deepskyblue; + content-align: center; + font-color: #D8D16F; + width: 100%; + height: 100%; + border-width: medium; + } + a.button { + margin-left: 5%; + margin-right: 4%; + align-items: center; + padding: 20px; + font-size: 1em; + white-space: nowrap; + display: inline-grid; + background-color: deepskyblue; + font: italic 12px Georgia; + } + + div.top-bar:hover, a.button:hover{ + text-decoration: none; + list-style-type: none; + background-color: navy; + } + + .errors { + color: aqua; + } + + div.callout.small{ + content-align: center; + border-color: #D8D16F; + border-width: medium; + } + + div.row.column{ + font: italic bold 12px/20px Georgia, serif; + width:100%; + display: inline-grid; + text-decoration: none; + list-style-type: none; + } + + h1.row.text-center, h2.row.text-center, h3.subheader{ + font: italic 35px Georgia, serif; + } + + div.top-bar, a.button{ + background-color: deepskyblue; + text-decoration: none; + list-style-type: none; + padding: 15px, 8px; + text-align: justify; + display: inline-grid; + background-color: deepskyblue; + } + + ul.menu{ + border-style: solid; + font: italic bold 12px/20px Georgia, serif; + display: inline-grid; + padding: 20px, 40px; + background-color: deepskyblue; + content-align: center; + border-color: #D8D16F; + border-width: medium; + margin: 10px; + } + + .container, .body{ + font: italic bold 12px/20px Georgia, serif; + width: 100%; + text-decoration: none; + list-style-type: none; + } diff --git a/app/controllers/RecipesController.rb b/app/controllers/RecipesController.rb new file mode 100644 index 000000000..befe0b61b --- /dev/null +++ b/app/controllers/RecipesController.rb @@ -0,0 +1,41 @@ +require "edamam_wrapper" +require "recipe" +require "welcome" +class RecipesController < ApplicationController + def index + @data = Recipes.all + end + + def create + RecipesWrapper.search(params[:query]) + redirect_to recipes_path + end + + def new + @label = params[:query] + end + + def find + @data = Recipe.find + end + + def create + result = Recipe.by_name(params[:label]) + if result == nil + flash[:notice] = "Search Failed for #{params[:query]}: #{result["error"]}" + end + redirect_to recipes_path + end + + def new + @recipe_name = params[:label] + end + + + + private + + def recipe_params + params.require(:query).permit(:label, :health, :diet, :calories) + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..d83690e1b --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,5 @@ +class ApplicationController < ActionController::Base + # Prevent CSRF attacks by raising an exception. + # For APIs, you may want to use :null_session instead. + protect_from_forgery with: :exception +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb 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/mailers/.keep b/app/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/models/.keep b/app/models/.keep new file mode 100644 index 000000000..e69de29bb 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..ea11a49d4 --- /dev/null +++ b/app/views/layouts/application.html.erb @@ -0,0 +1,66 @@ + + + + + + <%= stylesheet_link_tag "application" %> + <%= javascript_include_tag "application", 'data-turbolinks-track' => true %> + <%= csrf_meta_tags %> + + + +
    + + + <%= yield %> + + + + +
    +
    + +
    + <% Time.zone = "Pacific Time (US & Canada)" %> ThinkieDrinkieProductions © <%= copyright_notice_year_range(2016) %> All Rights Reserved. + <%= login_status %> +
    +
    +
    +
    + + diff --git a/app/views/recipes/index.html.erb b/app/views/recipes/index.html.erb new file mode 100644 index 000000000..f59b42bb8 --- /dev/null +++ b/app/views/recipes/index.html.erb @@ -0,0 +1,37 @@ +

    Ada Channels

    + +

    Your Recipes

    +<% if flash[:notice] %> +

    <%= flash[:notice] %>

    +<% end %> +
    +<% sections = ['
    ', + '
    ', + '
    '] %> + +<% counter = 0 %> +<% max = @data.length / 3 + 1 %> +<% @data.each do |data| %> + <% if counter % max == 0 %> + <%= sections[counter / max].html_safe %> +
      + <% end %> + <% counter += 1 %> +
    • <%= link_to data.name, new_message_path(data.name, data.id) %>
      • + + <% if counter % max == 0 %> +
    +
    + <% end %> +<% end %> + <% if counter % max != 0 %> + +
    +<% end %> +
    +<% sections = ['
    ', + '
    ', + '
    '] %> +<%if spanish_path %> + +
    diff --git a/app/views/recipes/show.html.erb b/app/views/recipes/show.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/welcome/show.html.erb b/app/views/welcome/show.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..04e9974fd --- /dev/null +++ b/bin/bundle @@ -0,0 +1,6 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) +load Gem.bin_path('bundler', 'bundle') +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..0138d79b7 --- /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', __FILE__) +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..acdb2c138 --- /dev/null +++ b/bin/setup @@ -0,0 +1,29 @@ +#!/usr/bin/env ruby +require 'pathname' + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +Dir.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 || bundle install" + + # puts "\n== Copying sample files ==" + # unless File.exist?("config/database.yml") + # system "cp config/database.yml.sample config/database.yml" + # end + + puts "\n== Preparing database ==" + system "bin/rake db:setup" + + puts "\n== Removing old logs and tempfiles ==" + system "rm -f log/*" + system "rm -rf tmp/cache" + + puts "\n== Restarting application server ==" + system "touch tmp/restart.txt" +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..9bc076b9e --- /dev/null +++ b/bin/spring @@ -0,0 +1,16 @@ +#!/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) + if spring = lockfile.specs.detect { |spec| spec.name == "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/config.ru b/config.ru new file mode 100644 index 000000000..bd83b2541 --- /dev/null +++ b/config.ru @@ -0,0 +1,4 @@ +# This file is used by Rack-based servers to start the application. + +require ::File.expand_path('../config/environment', __FILE__) +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 000000000..85f4e8c49 --- /dev/null +++ b/config/application.rb @@ -0,0 +1,28 @@ +require File.expand_path('../boot', __FILE__) + +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 MyApi + class Application < Rails::Application + config.middleware.use Rack::Deflater + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration should go into files in config/initializers + # -- all .rb files in that directory are automatically loaded. + + # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. + # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC. + # config.time_zone = 'Central Time (US & Canada)' + + # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. + # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] + # config.i18n.default_locale = :de + config.autoload_paths << Rails.root.join('lib') + # Do not swallow errors in after_commit/after_rollback callbacks. + config.active_record.raise_in_transactional_callbacks = true + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..6b750f00b --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,3 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..1c1a37ca8 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,25 @@ +# SQLite version 3.x +# gem install sqlite3 +# +# Ensure the SQLite 3 gem is defined in your Gemfile +# gem 'sqlite3' +# +default: &default + adapter: sqlite3 + pool: 5 + timeout: 5000 + +development: + <<: *default + database: db/development.sqlite3 + +# 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: db/test.sqlite3 + +production: + <<: *default + database: db/production.sqlite3 diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..ee8d90dc6 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require File.expand_path('../application', __FILE__) + +# 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..b55e2144b --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,41 @@ +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 and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = 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 + + # 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 + + # Asset digests allow you to set far-future HTTP expiration dates on all assets, + # yet still be able to expire them through the digest params. + config.assets.digest = true + + # Adds additional error checking when serving assets at runtime. + # Checks for improperly declared sprockets dependencies. + # Raises helpful error messages. + config.assets.raise_runtime_errors = true + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..5c1b32e48 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,79 @@ +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 + + # Enable Rack::Cache to put a simple HTTP cache in front of your application + # Add `rack-cache` to your Gemfile before enabling this. + # For large-scale production use, consider using a caching reverse proxy like + # NGINX, varnish or squid. + # config.action_dispatch.rack_cache = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.serve_static_files = 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 + + # Asset digests allow you to set far-future HTTP expiration dates on all assets, + # yet still be able to expire them through the digest params. + config.assets.digest = true + + # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb + + # 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 + + # 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 = [ :subdomain, :uuid ] + + # Use a different logger for distributed setups. + # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new) + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # 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 + + # 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..1c19f08b2 --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,42 @@ +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 static file server for tests with Cache-Control for performance. + config.serve_static_files = true + config.static_cache_control = 'public, max-age=3600' + + # 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 + + # 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 + + # Randomize the order test cases are executed. + config.active_support.test_order = :random + + # 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/assets.rb b/config/initializers/assets.rb new file mode 100644 index 000000000..01ef3e663 --- /dev/null +++ b/config/initializers/assets.rb @@ -0,0 +1,11 @@ +# 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 + +# Precompile additional assets. +# application.js, application.css, and all non-JS/CSS in app/assets folder are already added. +# Rails.application.config.assets.precompile += %w( search.js ) 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/cookies_serializer.rb b/config/initializers/cookies_serializer.rb new file mode 100644 index 000000000..7f70458de --- /dev/null +++ b/config/initializers/cookies_serializer.rb @@ -0,0 +1,3 @@ +# Be sure to restart your server when you modify this file. + +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..526a89319 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,10 @@ +# 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 +Mime::Type.register "gizp/json", :gzipjson + +ActionDispatch::ParamsParser::DEFAULT_PARSERS[Mime::Type.lookup('gzip/json')]=lambda do |raw_body| + body = ActiveSupport::Gzip.decompress(raw_body) + JSON.parse(body).with_indifferent_access +end diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb new file mode 100644 index 000000000..1125c19e4 --- /dev/null +++ b/config/initializers/session_store.rb @@ -0,0 +1,3 @@ +# Be sure to restart your server when you modify this file. + +Rails.application.config.session_store :cookie_store, key: '_my_api_session' diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..33725e95f --- /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] if respond_to?(:wrap_parameters) +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..065395716 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,23 @@ +# 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. +# +# 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/routes.rb b/config/routes.rb new file mode 100644 index 000000000..11769b1b7 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,61 @@ +Rails.application.routes.draw do + root 'welcome/index' + get 'welcome/index', to: 'welcome#index' + get 'welcome/show', to: 'welcome#show' + get 'recipequery/index', to: 'recipequery#index' + get 'recipequery/show/:id', to: 'recipequery#show' + # The priority is based upon order of creation: first created -> highest priority. + # See how all your routes lay out with "rake routes". + + # You can have the root of your site routed with "root" + # root 'welcome#index' + + # Example of regular route: + # get 'products/:id' => 'catalog#view' + + # Example of named route that can be invoked with purchase_url(id: product.id) + # get 'products/:id/purchase' => 'catalog#purchase', as: :purchase + + # Example resource route (maps HTTP verbs to controller actions automatically): + # resources :products + + # Example resource route with options: + # resources :products do + # member do + # get 'short' + # post 'toggle' + # end + # + # collection do + # get 'sold' + # end + # end + + # Example resource route with sub-resources: + # resources :products do + # resources :comments, :sales + # resource :seller + # end + + # Example resource route with more complex sub-resources: + # resources :products do + # resources :comments + # resources :sales do + # get 'recent', on: :collection + # end + # end + + # Example resource route with concerns: + # concern :toggleable do + # post 'toggle' + # end + # resources :posts, concerns: :toggleable + # resources :photos, concerns: :toggleable + + # Example resource route within a namespace: + # namespace :admin do + # # Directs /admin/products/* to Admin::ProductsController + # # (app/controllers/admin/products_controller.rb) + # resources :products + # end +end diff --git a/config/secrets.yml b/config/secrets.yml new file mode 100644 index 000000000..0cedbecb2 --- /dev/null +++ b/config/secrets.yml @@ -0,0 +1,22 @@ +# Be sure to restart your server when you modify this file. + +# Your secret key is used for verifying the integrity of signed cookies. +# If you change this key, all old signed cookies will become invalid! + +# Make sure the secret is at least 30 characters and all random, +# no regular words or you'll be exposed to dictionary attacks. +# You can use `rake secret` to generate a secure secret key. + +# Make sure the secrets in this file are kept private +# if you're sharing your code publicly. + +development: + secret_key_base: b3292f60667236039097995755e068b2d0bc0daf88087c3cdbe71fcf1fca180f5b9aaf8bd24bc133c13d80a318c61de3e361c18b41485f25fccbb7f83d4b359e + +test: + secret_key_base: b91048b22405fa6ba1475fd770a655136025e39672ca38058e495572987469a97a22440f3132cb5074767c2e693ebd39bbebbe2f85acdc81fd001c78e54e39c8 + +# Do not keep production secrets in the repository, +# instead read values from the environment. +production: + secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> diff --git a/db/seeds.rb b/db/seeds.rb new file mode 100644 index 000000000..4edb1e857 --- /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 rake db:seed (or created alongside the db with db:setup). +# +# Examples: +# +# cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }]) +# Mayor.create(name: 'Emanuel', city: cities.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..9aa85167c --- /dev/null +++ b/lib/edamam_wrapper.rb @@ -0,0 +1,49 @@ +require 'httparty' + +class EdamamWrapper + BASE_URL = "https://api.edamam.com/search" + ESP_BASE_URL = "https://api.edamam.com/search" + TOKEN = ENV["TOKEN"] + + def self.listrecipes(query) + + url = BASE_URL + "?#{query}" + "app_id=#{ID}" + "&app_key=#{TOKEN}" + data = HTTParty.get(url) + recipe_list = [] + if data["recipes"] + data["recipes"].each do |recipe| + wrapper = Recipe.new recipe["token"],recipe["id"], q: recipe["label"], recipe["image"], recipe["ingredients"], recipe["dietLabels"], recipe["healthLabels"] + recipe_list << wrapper + end + end + #return array of ruby objects rather than a hash of non-parsed data + return recipe_list + end + + def self.list_esp_recipes(query) + url = ESP_BASE_URL + "?#{query}" + "app_id=#{ID}" + "&app_key=#{TOKEN}" + data = HTTParty.get(url) + recipe_list = [] + if data["recipes"] + data["recipes"].each do |recipe| + wrapper = Recipe.new recipe["label"], recipe["image"], is_archived: recipe["url"], members: recipe["members"] + recipe_list << wrapper + end + end + end + + def self.sendmsg(recipe, msg, token = nil) + token = TOKEN if token == nil + puts "Search for a recipe #{query_text} : #{search}" + url = BASE_URL + "chat.postMessage?" + "token=#{TOKEN}" + data = HTTParty.post(url, + #just one way of setting up the hash.. search, recipe required; others chosen + body: { + "query_text" => "#{query_text}", + "q" => "#{q}", + "label" => "false", + }, + :headers => { 'Content-Type' => 'application/x-www-form-urlencoded' }) + data + end +end diff --git a/lib/recipe.rb b/lib/recipe.rb new file mode 100644 index 000000000..ef1077374 --- /dev/null +++ b/lib/recipe.rb @@ -0,0 +1,52 @@ +class Recipe + + attr_reader :name, :id, :label, :recipe, :image + + def initialize(name, id, options = {} ) + # Commented out because there's no way I'd be able to remember + # all this live. + # @purpose = options[:purpose] + # @is_archived = options[:is_archived] + # @is_general = options[:is_archived] + # @members = options[:members] + @name = name + @id = id + end + + # Send a message to this slack channel + # Returns the data from the Slack server's response + def show + end + + # Create a class-level instance variable. + # Musch more likely to work as expected than a class variable + # See http://www.railstips.org/blog/archives/2006/11/18/class-and-instance-variables-in-ruby/ + class << self + attr_reader :channels + end + + # class << self, an instance variable we have access to "Channel.channels", another way of writing a function self.all + + # Return a memoized set of all channels + def self.all + SlackApiWrapper.listchannels + end + + # Foreget all memoized values + def self.reset + end + + # Return either the first (probably only) channel matching + # the given name, or nil. + def self.by_name(name) + matches = all.select do |c| + c.name == name + end + return matches.first + end + + # Return either the first (probably only) channel matching + # the given ID, or nil. + def self.by_id(id) + end +end diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/lib/welcome.rb b/lib/welcome.rb new file mode 100644 index 000000000..ce0a7e8ee --- /dev/null +++ b/lib/welcome.rb @@ -0,0 +1,6 @@ +class Recipe < ActiveRecord::Base + def self.search(query) + query = "%#{query}%" + Product.where("name LIKE ? OR description LIKE ?", query, query) + end +end diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/my_api/lib/welcome.rb b/my_api/lib/welcome.rb new file mode 100644 index 000000000..ce0a7e8ee --- /dev/null +++ b/my_api/lib/welcome.rb @@ -0,0 +1,6 @@ +class Recipe < ActiveRecord::Base + def self.search(query) + query = "%#{query}%" + Product.where("name LIKE ? OR description LIKE ?", query, query) + end +end diff --git a/public/404.html b/public/404.html new file mode 100644 index 000000000..b612547fc --- /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..a21f82b3b --- /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..061abc587 --- /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/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..3c9c7c01f --- /dev/null +++ b/public/robots.txt @@ -0,0 +1,5 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file +# +# To ban all spiders from the entire site uncomment the next two lines: +# User-agent: * +# Disallow: / diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/.keep b/test/fixtures/.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/lib/edamam_wrapper_test.rb b/test/lib/edamam_wrapper_test.rb new file mode 100644 index 000000000..e69de29bb diff --git a/test/lib/recipe_test.rb b/test/lib/recipe_test.rb 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/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..1fd77d60a --- /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/reporters" +require 'vcr' +require 'webmock/minitest' + +VCR.configure do |config| + config.cassette_library_dir = 'test/cassettes' # folder where casettes will be located + config.hook_into :webmock # tie into this other tool called webmock + config.default_cassette_options = { + :record => :new_episodes, # record new data when we don't have it yet + :match_requests_on => [:method, :uri, :body] # The http method, URI and body of a request all need to match + } +end + + +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... + Minitest::Reporters.use! # use Minitest Reporters for colored output. +end diff --git a/vendor/assets/javascripts/.keep b/vendor/assets/javascripts/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/assets/stylesheets/.keep b/vendor/assets/stylesheets/.keep new file mode 100644 index 000000000..e69de29bb From f50225c9b0505ad1cb3c96917372a7cd786c8840 Mon Sep 17 00:00:00 2001 From: Natasha Ewing Date: Sun, 6 Nov 2016 17:00:08 -0800 Subject: [PATCH 09/11] deleting unnecessary private method --- app/controllers/RecipesController.rb | 7 ------- 1 file changed, 7 deletions(-) diff --git a/app/controllers/RecipesController.rb b/app/controllers/RecipesController.rb index befe0b61b..272a2a5d3 100644 --- a/app/controllers/RecipesController.rb +++ b/app/controllers/RecipesController.rb @@ -31,11 +31,4 @@ def new @recipe_name = params[:label] end - - - private - - def recipe_params - params.require(:query).permit(:label, :health, :diet, :calories) - end end From 5a5f364a44d0f8c1056af3301fc86a64b8e2fca7 Mon Sep 17 00:00:00 2001 From: Natasha Ewing Date: Sun, 6 Nov 2016 23:56:40 -0800 Subject: [PATCH 10/11] show, index, search pages cleaned up and organized. added pagination --- app/assets/javascripts/application.js | 1 + app/assets/javascripts/home.coffee | 3 + app/assets/javascripts/recipe.coffee | 3 + app/assets/javascripts/recipes.coffee | 3 + .../javascripts/recipes_api_controller.coffee | 3 + app/assets/stylesheets/_settings.scss | 573 ++++++++++++++++++ app/assets/stylesheets/application.scss | 24 +- .../stylesheets/foundation_and_overrides.scss | 51 ++ app/assets/stylesheets/recipe.scss | 3 + app/assets/stylesheets/recipes.scss | 3 + app/controllers/RecipesController.rb | 34 -- app/controllers/application_controller.rb | 3 +- app/controllers/recipes_controller.rb | 31 + app/helpers/recipes_helper.rb | 2 + app/views/layouts/application.html.erb | 69 +-- app/views/recipes/index.html.erb | 49 +- app/views/recipes/popular.html.erb | 2 + app/views/recipes/search.html.erb | 36 ++ app/views/recipes/show.html.erb | 43 ++ app/views/recipes/start.html.erb | 21 + config/routes.rb | 23 +- .../adaprojects/APIapp/assets/images/.keep | 0 .../assets/stylesheets/application.scss | 113 ++++ .../APIapp/controllers/RecipesController.rb | 30 + .../controllers/application_controller.rb | 5 + .../APIapp/controllers/concerns/.keep | 0 .../APIapp/helpers/application_helper.rb | 2 + documents/adaprojects/APIapp/mailers/.keep | 0 documents/adaprojects/APIapp/models/.keep | 0 .../adaprojects/APIapp/models/concerns/.keep | 0 .../APIapp/views/layouts/application.html.erb | 66 ++ .../APIapp/views/recipes/index.html.erb | 37 ++ .../APIapp/views/recipes/show.html.erb | 0 .../APIapp/views/welcome/index.html.erb | 0 .../APIapp/views/welcome/show.html.erb | 0 35 files changed, 1098 insertions(+), 135 deletions(-) create mode 100644 app/assets/javascripts/home.coffee create mode 100644 app/assets/javascripts/recipe.coffee create mode 100644 app/assets/javascripts/recipes.coffee create mode 100644 app/assets/javascripts/recipes_api_controller.coffee create mode 100644 app/assets/stylesheets/_settings.scss create mode 100644 app/assets/stylesheets/foundation_and_overrides.scss create mode 100644 app/assets/stylesheets/recipe.scss create mode 100644 app/assets/stylesheets/recipes.scss delete mode 100644 app/controllers/RecipesController.rb create mode 100644 app/controllers/recipes_controller.rb create mode 100644 app/helpers/recipes_helper.rb create mode 100644 app/views/recipes/popular.html.erb create mode 100644 app/views/recipes/search.html.erb create mode 100644 app/views/recipes/start.html.erb rename app/views/welcome/index.html.erb => documents/adaprojects/APIapp/assets/images/.keep (100%) create mode 100644 documents/adaprojects/APIapp/assets/stylesheets/application.scss create mode 100644 documents/adaprojects/APIapp/controllers/RecipesController.rb create mode 100644 documents/adaprojects/APIapp/controllers/application_controller.rb rename app/views/welcome/show.html.erb => documents/adaprojects/APIapp/controllers/concerns/.keep (100%) create mode 100644 documents/adaprojects/APIapp/helpers/application_helper.rb create mode 100644 documents/adaprojects/APIapp/mailers/.keep create mode 100644 documents/adaprojects/APIapp/models/.keep create mode 100644 documents/adaprojects/APIapp/models/concerns/.keep create mode 100644 documents/adaprojects/APIapp/views/layouts/application.html.erb create mode 100644 documents/adaprojects/APIapp/views/recipes/index.html.erb create mode 100644 documents/adaprojects/APIapp/views/recipes/show.html.erb create mode 100644 documents/adaprojects/APIapp/views/welcome/index.html.erb create mode 100644 documents/adaprojects/APIapp/views/welcome/show.html.erb diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index e07c5a830..bca6ea7f2 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -14,3 +14,4 @@ //= require jquery_ujs //= require turbolinks //= require_tree . +$(function(){ $(document).foundation(); }); diff --git a/app/assets/javascripts/home.coffee b/app/assets/javascripts/home.coffee new file mode 100644 index 000000000..24f83d18b --- /dev/null +++ b/app/assets/javascripts/home.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/javascripts/recipe.coffee b/app/assets/javascripts/recipe.coffee new file mode 100644 index 000000000..24f83d18b --- /dev/null +++ b/app/assets/javascripts/recipe.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/javascripts/recipes.coffee b/app/assets/javascripts/recipes.coffee new file mode 100644 index 000000000..24f83d18b --- /dev/null +++ b/app/assets/javascripts/recipes.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/javascripts/recipes_api_controller.coffee b/app/assets/javascripts/recipes_api_controller.coffee new file mode 100644 index 000000000..24f83d18b --- /dev/null +++ b/app/assets/javascripts/recipes_api_controller.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/stylesheets/_settings.scss b/app/assets/stylesheets/_settings.scss new file mode 100644 index 000000000..9eed96e38 --- /dev/null +++ b/app/assets/stylesheets/_settings.scss @@ -0,0 +1,573 @@ +// Foundation for Sites Settings +// ----------------------------- +// +// Table of Contents: +// +// 1. Global +// 2. Breakpoints +// 3. The Grid +// 4. Base Typography +// 5. Typography Helpers +// 6. Abide +// 7. Accordion +// 8. Accordion Menu +// 9. Badge +// 10. Breadcrumbs +// 11. Button +// 12. Button Group +// 13. Callout +// 14. Close Button +// 15. Drilldown +// 16. Dropdown +// 17. Dropdown Menu +// 18. Flex Video +// 19. Forms +// 20. Label +// 21. Media Object +// 22. Menu +// 23. Meter +// 24. Off-canvas +// 25. Orbit +// 26. Pagination +// 27. Progress Bar +// 28. Reveal +// 29. Slider +// 30. Switch +// 31. Table +// 32. Tabs +// 33. Thumbnail +// 34. Title Bar +// 35. Tooltip +// 36. Top Bar + +@import 'util/util'; + +// 1. Global +// --------- + +$global-font-size: 100%; +$global-width: rem-calc(1200); +$global-lineheight: 1.5; +$foundation-palette: ( + primary: #2199e8, + secondary: #777, + success: #3adb76, + warning: #ffae00, + alert: #ec5840, +); +$light-gray: #e6e6e6; +$medium-gray: #cacaca; +$dark-gray: #8a8a8a; +$black: #0a0a0a; +$white: #fefefe; +$body-background: $white; +$body-font-color: $black; +$body-font-family: 'Helvetica Neue', Helvetica, Roboto, Arial, sans-serif; +$body-antialiased: true; +$global-margin: 1rem; +$global-padding: 1rem; +$global-weight-normal: normal; +$global-weight-bold: bold; +$global-radius: 0; +$global-text-direction: ltr; +$global-flexbox: false; +$print-transparent-backgrounds: true; + +@include add-foundation-colors; + +// 2. Breakpoints +// -------------- + +$breakpoints: ( + small: 0, + medium: 640px, + large: 1024px, + xlarge: 1200px, + xxlarge: 1440px, +); +$breakpoint-classes: (small medium large); + +// 3. The Grid +// ----------- + +$grid-row-width: $global-width; +$grid-column-count: 12; +$grid-column-gutter: ( + small: 20px, + medium: 30px, +); +$grid-column-align-edge: true; +$block-grid-max: 8; + +// 4. Base Typography +// ------------------ + +$header-font-family: $body-font-family; +$header-font-weight: $global-weight-normal; +$header-font-style: normal; +$font-family-monospace: Consolas, 'Liberation Mono', Courier, monospace; +$header-sizes: ( + small: ( + 'h1': 24, + 'h2': 20, + 'h3': 19, + 'h4': 18, + 'h5': 17, + 'h6': 16, + ), + medium: ( + 'h1': 48, + 'h2': 40, + 'h3': 31, + 'h4': 25, + 'h5': 20, + 'h6': 16, + ), +); +$header-color: inherit; +$header-lineheight: 1.4; +$header-margin-bottom: 0.5rem; +$header-text-rendering: optimizeLegibility; +$small-font-size: 80%; +$header-small-font-color: $medium-gray; +$paragraph-lineheight: 1.6; +$paragraph-margin-bottom: 1rem; +$paragraph-text-rendering: optimizeLegibility; +$code-color: $black; +$code-font-family: $font-family-monospace; +$code-font-weight: $global-weight-normal; +$code-background: $light-gray; +$code-border: 1px solid $medium-gray; +$code-padding: rem-calc(2 5 1); +$anchor-color: $primary-color; +$anchor-color-hover: scale-color($anchor-color, $lightness: -14%); +$anchor-text-decoration: none; +$anchor-text-decoration-hover: none; +$hr-width: $global-width; +$hr-border: 1px solid $medium-gray; +$hr-margin: rem-calc(20) auto; +$list-lineheight: $paragraph-lineheight; +$list-margin-bottom: $paragraph-margin-bottom; +$list-style-type: disc; +$list-style-position: outside; +$list-side-margin: 1.25rem; +$list-nested-side-margin: 1.25rem; +$defnlist-margin-bottom: 1rem; +$defnlist-term-weight: $global-weight-bold; +$defnlist-term-margin-bottom: 0.3rem; +$blockquote-color: $dark-gray; +$blockquote-padding: rem-calc(9 20 0 19); +$blockquote-border: 1px solid $medium-gray; +$cite-font-size: rem-calc(13); +$cite-color: $dark-gray; +$keystroke-font: $font-family-monospace; +$keystroke-color: $black; +$keystroke-background: $light-gray; +$keystroke-padding: rem-calc(2 4 0); +$keystroke-radius: $global-radius; +$abbr-underline: 1px dotted $black; + +// 5. Typography Helpers +// --------------------- + +$lead-font-size: $global-font-size * 1.25; +$lead-lineheight: 1.6; +$subheader-lineheight: 1.4; +$subheader-color: $dark-gray; +$subheader-font-weight: $global-weight-normal; +$subheader-margin-top: 0.2rem; +$subheader-margin-bottom: 0.5rem; +$stat-font-size: 2.5rem; + +// 6. Abide +// -------- + +$abide-inputs: true; +$abide-labels: true; +$input-background-invalid: map-get($foundation-palette, alert); +$form-label-color-invalid: map-get($foundation-palette, alert); +$input-error-color: map-get($foundation-palette, alert); +$input-error-font-size: rem-calc(12); +$input-error-font-weight: $global-weight-bold; + +// 7. Accordion +// ------------ + +$accordion-background: $white; +$accordion-plusminus: true; +$accordion-item-color: foreground($accordion-background, $primary-color); +$accordion-item-background-hover: $light-gray; +$accordion-item-padding: 1.25rem 1rem; +$accordion-content-background: $white; +$accordion-content-border: 1px solid $light-gray; +$accordion-content-color: foreground($accordion-content-background, $body-font-color); +$accordion-content-padding: 1rem; + +// 8. Accordion Menu +// ----------------- + +$accordionmenu-arrows: true; +$accordionmenu-arrow-color: $primary-color; + +// 9. Badge +// -------- + +$badge-background: $primary-color; +$badge-color: foreground($badge-background); +$badge-padding: 0.3em; +$badge-minwidth: 2.1em; +$badge-font-size: 0.6rem; + +// 10. Breadcrumbs +// --------------- + +$breadcrumbs-margin: 0 0 $global-margin 0; +$breadcrumbs-item-font-size: rem-calc(11); +$breadcrumbs-item-color: $primary-color; +$breadcrumbs-item-color-current: $black; +$breadcrumbs-item-color-disabled: $medium-gray; +$breadcrumbs-item-margin: 0.75rem; +$breadcrumbs-item-uppercase: true; +$breadcrumbs-item-slash: true; + +// 11. Button +// ---------- + +$button-padding: 0.85em 1em; +$button-margin: 0 0 $global-margin 0; +$button-fill: solid; +$button-background: $primary-color; +$button-background-hover: scale-color($button-background, $lightness: -15%); +$button-color: $white; +$button-color-alt: $black; +$button-radius: $global-radius; +$button-sizes: ( + tiny: 0.6rem, + small: 0.75rem, + default: 0.9rem, + large: 1.25rem, +); +$button-opacity-disabled: 0.25; +$button-background-hover-lightness: -20%; +$button-hollow-hover-lightness: -50%; + +// 12. Button Group +// ---------------- + +$buttongroup-margin: 1rem; +$buttongroup-spacing: 1px; +$buttongroup-child-selector: '.button'; +$buttongroup-expand-max: 6; + +// 13. Callout +// ----------- + +$callout-background: $white; +$callout-background-fade: 85%; +$callout-border: 1px solid rgba($black, 0.25); +$callout-margin: 0 0 1rem 0; +$callout-padding: 1rem; +$callout-font-color: $body-font-color; +$callout-font-color-alt: $body-background; +$callout-radius: $global-radius; +$callout-link-tint: 30%; + +// 14. Close Button +// ---------------- + +$closebutton-position: right top; +$closebutton-offset-horizontal: 1rem; +$closebutton-offset-vertical: 0.5rem; +$closebutton-size: 2em; +$closebutton-lineheight: 1; +$closebutton-color: $dark-gray; +$closebutton-color-hover: $black; + +// 15. Drilldown +// ------------- + +$drilldown-transition: transform 0.15s linear; +$drilldown-arrows: true; +$drilldown-arrow-color: $primary-color; +$drilldown-background: $white; + +// 16. Dropdown +// ------------ + +$dropdown-padding: 1rem; +$dropdown-border: 1px solid $medium-gray; +$dropdown-font-size: 1rem; +$dropdown-width: 300px; +$dropdown-radius: $global-radius; +$dropdown-sizes: ( + tiny: 100px, + small: 200px, + large: 400px, +); + +// 17. Dropdown Menu +// ----------------- + +$dropdownmenu-arrows: true; +$dropdownmenu-arrow-color: $anchor-color; +$dropdownmenu-min-width: 200px; +$dropdownmenu-background: $white; +$dropdownmenu-border: 1px solid $medium-gray; + +// 18. Flex Video +// -------------- + +$flexvideo-margin-bottom: rem-calc(16); +$flexvideo-ratio: 4 by 3; +$flexvideo-ratio-widescreen: 16 by 9; + +// 19. Forms +// --------- + +$fieldset-border: 1px solid $medium-gray; +$fieldset-padding: rem-calc(20); +$fieldset-margin: rem-calc(18 0); +$legend-padding: rem-calc(0 3); +$form-spacing: rem-calc(16); +$helptext-color: $black; +$helptext-font-size: rem-calc(13); +$helptext-font-style: italic; +$input-prefix-color: $black; +$input-prefix-background: $light-gray; +$input-prefix-border: 1px solid $medium-gray; +$input-prefix-padding: 1rem; +$form-label-color: $black; +$form-label-font-size: rem-calc(14); +$form-label-font-weight: $global-weight-normal; +$form-label-line-height: 1.8; +$select-background: $white; +$select-triangle-color: $dark-gray; +$select-radius: $global-radius; +$input-color: $black; +$input-placeholder-color: $medium-gray; +$input-font-family: inherit; +$input-font-size: rem-calc(16); +$input-background: $white; +$input-background-focus: $white; +$input-background-disabled: $light-gray; +$input-border: 1px solid $medium-gray; +$input-border-focus: 1px solid $dark-gray; +$input-shadow: inset 0 1px 2px rgba($black, 0.1); +$input-shadow-focus: 0 0 5px $medium-gray; +$input-cursor-disabled: not-allowed; +$input-transition: box-shadow 0.5s, border-color 0.25s ease-in-out; +$input-number-spinners: true; +$input-radius: $global-radius; +$button-radius: $global-radius; + +// 20. Label +// --------- + +$label-background: $primary-color; +$label-color: foreground($label-background); +$label-font-size: 0.8rem; +$label-padding: 0.33333rem 0.5rem; +$label-radius: $global-radius; + +// 21. Media Object +// ---------------- + +$mediaobject-margin-bottom: $global-margin; +$mediaobject-section-padding: $global-padding; +$mediaobject-image-width-stacked: 100%; + +// 22. Menu +// -------- + +$menu-margin: 0; +$menu-margin-nested: 1rem; +$menu-item-padding: 0.7rem 1rem; +$menu-item-color-active: $white; +$menu-item-background-active: map-get($foundation-palette, primary); +$menu-icon-spacing: 0.25rem; + +// 23. Meter +// --------- + +$meter-height: 1rem; +$meter-radius: $global-radius; +$meter-background: $medium-gray; +$meter-fill-good: $success-color; +$meter-fill-medium: $warning-color; +$meter-fill-bad: $alert-color; + +// 24. Off-canvas +// -------------- + +$offcanvas-size: 250px; +$offcanvas-background: $light-gray; +$offcanvas-zindex: -1; +$offcanvas-transition-length: 0.5s; +$offcanvas-transition-timing: ease; +$offcanvas-fixed-reveal: true; +$offcanvas-exit-background: rgba($white, 0.25); +$maincontent-class: 'off-canvas-content'; +$maincontent-shadow: 0 0 10px rgba($black, 0.5); + +// 25. Orbit +// --------- + +$orbit-bullet-background: $medium-gray; +$orbit-bullet-background-active: $dark-gray; +$orbit-bullet-diameter: 1.2rem; +$orbit-bullet-margin: 0.1rem; +$orbit-bullet-margin-top: 0.8rem; +$orbit-bullet-margin-bottom: 0.8rem; +$orbit-caption-background: rgba($black, 0.5); +$orbit-caption-padding: 1rem; +$orbit-control-background-hover: rgba($black, 0.5); +$orbit-control-padding: 1rem; +$orbit-control-zindex: 10; + +// 26. Pagination +// -------------- + +$pagination-font-size: rem-calc(14); +$pagination-margin-bottom: $global-margin; +$pagination-item-color: $black; +$pagination-item-padding: rem-calc(3 10); +$pagination-item-spacing: rem-calc(1); +$pagination-radius: $global-radius; +$pagination-item-background-hover: $light-gray; +$pagination-item-background-current: $primary-color; +$pagination-item-color-current: foreground($pagination-item-background-current); +$pagination-item-color-disabled: $medium-gray; +$pagination-ellipsis-color: $black; +$pagination-mobile-items: false; +$pagination-mobile-current-item: false; +$pagination-arrows: true; + +// 27. Progress Bar +// ---------------- + +$progress-height: 1rem; +$progress-background: $medium-gray; +$progress-margin-bottom: $global-margin; +$progress-meter-background: $primary-color; +$progress-radius: $global-radius; + +// 28. Reveal +// ---------- + +$reveal-background: $white; +$reveal-width: 600px; +$reveal-max-width: $global-width; +$reveal-padding: $global-padding; +$reveal-border: 1px solid $medium-gray; +$reveal-radius: $global-radius; +$reveal-zindex: 1005; +$reveal-overlay-background: rgba($black, 0.45); + +// 29. Slider +// ---------- + +$slider-width-vertical: 0.5rem; +$slider-transition: all 0.2s ease-in-out; +$slider-height: 0.5rem; +$slider-background: $light-gray; +$slider-fill-background: $medium-gray; +$slider-handle-height: 1.4rem; +$slider-handle-width: 1.4rem; +$slider-handle-background: $primary-color; +$slider-opacity-disabled: 0.25; +$slider-radius: $global-radius; + +// 30. Switch +// ---------- + +$switch-background: $medium-gray; +$switch-background-active: $primary-color; +$switch-height: 2rem; +$switch-height-tiny: 1.5rem; +$switch-height-small: 1.75rem; +$switch-height-large: 2.5rem; +$switch-radius: $global-radius; +$switch-margin: $global-margin; +$switch-paddle-background: $white; +$switch-paddle-offset: 0.25rem; +$switch-paddle-radius: $global-radius; +$switch-paddle-transition: all 0.25s ease-out; + +// 31. Table +// --------- + +$table-background: $white; +$table-color-scale: 5%; +$table-border: 1px solid smart-scale($table-background, $table-color-scale); +$table-padding: rem-calc(8 10 10); +$table-hover-scale: 2%; +$table-row-hover: darken($table-background, $table-hover-scale); +$table-row-stripe-hover: darken($table-background, $table-color-scale + $table-hover-scale); +$table-striped-background: smart-scale($table-background, $table-color-scale); +$table-stripe: even; +$table-head-background: smart-scale($table-background, $table-color-scale / 2); +$table-head-row-hover: darken($table-head-background, $table-hover-scale); +$table-foot-background: smart-scale($table-background, $table-color-scale); +$table-foot-row-hover: darken($table-foot-background, $table-hover-scale); +$table-head-font-color: $body-font-color; +$table-foot-font-color: $body-font-color; +$show-header-for-stacked: false; + +// 32. Tabs +// -------- + +$tab-margin: 0; +$tab-background: $white; +$tab-background-active: $light-gray; +$tab-item-font-size: rem-calc(12); +$tab-item-background-hover: $white; +$tab-item-padding: 1.25rem 1.5rem; +$tab-expand-max: 6; +$tab-content-background: $white; +$tab-content-border: $light-gray; +$tab-content-color: foreground($tab-background, $primary-color); +$tab-content-padding: 1rem; + +// 33. Thumbnail +// ------------- + +$thumbnail-border: solid 4px $white; +$thumbnail-margin-bottom: $global-margin; +$thumbnail-shadow: 0 0 0 1px rgba($black, 0.2); +$thumbnail-shadow-hover: 0 0 6px 1px rgba($primary-color, 0.5); +$thumbnail-transition: box-shadow 200ms ease-out; +$thumbnail-radius: $global-radius; + +// 34. Title Bar +// ------------- + +$titlebar-background: $black; +$titlebar-color: $white; +$titlebar-padding: 0.5rem; +$titlebar-text-font-weight: bold; +$titlebar-icon-color: $white; +$titlebar-icon-color-hover: $medium-gray; +$titlebar-icon-spacing: 0.25rem; + +// 35. Tooltip +// ----------- + +$has-tip-font-weight: $global-weight-bold; +$has-tip-border-bottom: dotted 1px $dark-gray; +$tooltip-background-color: $black; +$tooltip-color: $white; +$tooltip-padding: 0.75rem; +$tooltip-font-size: $small-font-size; +$tooltip-pip-width: 0.75rem; +$tooltip-pip-height: $tooltip-pip-width * 0.866; +$tooltip-radius: $global-radius; + +// 36. Top Bar +// ----------- + +$topbar-padding: 0.5rem; +$topbar-background: $light-gray; +$topbar-submenu-background: $topbar-background; +$topbar-title-spacing: 1rem; +$topbar-input-width: 200px; +$topbar-unstack-breakpoint: medium; diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index c91b644d8..573922fa2 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -26,21 +26,21 @@ img.thumbnail{ display: inline-block; align-items: center; - width: 200px; - height: 220px; - border: solid 3px navy; + width: 150px; + height: 150px; + border-style: groove 3px silver; } + h1.AllList{ background-color: deepskyblue; font: italic bold 12px/20px Georgia, serif; width: 100%; } - .footer{ + .footer, .nav{ background-color: deepskyblue; content-align: center; font-color: #D8D16F; - width: 100%; - height: 100%; + border-width: medium; } a.button { @@ -65,15 +65,15 @@ color: aqua; } - div.callout.small{ + div.callout.small, div.callout.large{ content-align: center; - border-color: #D8D16F; + border-color: silver; border-width: medium; } div.row.column{ font: italic bold 12px/20px Georgia, serif; - width:100%; + width:90%; display: inline-grid; text-decoration: none; list-style-type: none; @@ -100,14 +100,16 @@ padding: 20px, 40px; background-color: deepskyblue; content-align: center; - border-color: #D8D16F; + border-color: silver; border-width: medium; margin: 10px; } + .container, .body{ + margin-left: 20px; + margin-right: 20px; font: italic bold 12px/20px Georgia, serif; - width: 100%; text-decoration: none; list-style-type: none; } diff --git a/app/assets/stylesheets/foundation_and_overrides.scss b/app/assets/stylesheets/foundation_and_overrides.scss new file mode 100644 index 000000000..e1ab58bb1 --- /dev/null +++ b/app/assets/stylesheets/foundation_and_overrides.scss @@ -0,0 +1,51 @@ +@charset 'utf-8'; +@import 'settings'; +@import 'foundation'; + +// If you'd like to include motion-ui the foundation-rails gem comes prepackaged with it, uncomment the 3 @imports, if you are not using the gem you need to install the motion-ui sass package. +// + @import 'motion-ui/motion-ui'; + +// We include everything by default. To slim your CSS, remove components you don't use. + +@include foundation-global-styles; +@include foundation-grid; +@include foundation-typography; +@include foundation-button; +@include foundation-forms; +@include foundation-visibility-classes; +@include foundation-float-classes; +@include foundation-accordion; +@include foundation-accordion-menu; +@include foundation-badge; +@include foundation-breadcrumbs; +@include foundation-button-group; +@include foundation-callout; +@include foundation-close-button; +@include foundation-drilldown-menu; +@include foundation-dropdown; +@include foundation-dropdown-menu; +@include foundation-flex-video; +@include foundation-label; +@include foundation-media-object; +@include foundation-menu; +@include foundation-menu-icon; +@include foundation-off-canvas; +@include foundation-orbit; +@include foundation-pagination; +@include foundation-progress-bar; +@include foundation-slider; +@include foundation-sticky; +@include foundation-reveal; +@include foundation-switch; +@include foundation-table; +@include foundation-tabs; +@include foundation-thumbnail; +@include foundation-title-bar; +@include foundation-tooltip; +@include foundation-top-bar; + +// If you'd like to include motion-ui the foundation-rails gem comes prepackaged with it, uncomment the 3 @imports, if you are not using the gem you need to install the motion-ui sass package. +// +@include motion-ui-transitions; +@include motion-ui-animations; diff --git a/app/assets/stylesheets/recipe.scss b/app/assets/stylesheets/recipe.scss new file mode 100644 index 000000000..e7c0bf6d0 --- /dev/null +++ b/app/assets/stylesheets/recipe.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Recipe controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/recipes.scss b/app/assets/stylesheets/recipes.scss new file mode 100644 index 000000000..1e10ffa50 --- /dev/null +++ b/app/assets/stylesheets/recipes.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the recipes 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/RecipesController.rb b/app/controllers/RecipesController.rb deleted file mode 100644 index 272a2a5d3..000000000 --- a/app/controllers/RecipesController.rb +++ /dev/null @@ -1,34 +0,0 @@ -require "edamam_wrapper" -require "recipe" -require "welcome" -class RecipesController < ApplicationController - def index - @data = Recipes.all - end - - def create - RecipesWrapper.search(params[:query]) - redirect_to recipes_path - end - - def new - @label = params[:query] - end - - def find - @data = Recipe.find - end - - def create - result = Recipe.by_name(params[:label]) - if result == nil - flash[:notice] = "Search Failed for #{params[:query]}: #{result["error"]}" - end - redirect_to recipes_path - end - - def new - @recipe_name = params[:label] - end - -end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index d83690e1b..09bc7ac87 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,5 +1,6 @@ +require 'recipe' +require 'httparty' class ApplicationController < ActionController::Base # Prevent CSRF attacks by raising an exception. # For APIs, you may want to use :null_session instead. - protect_from_forgery with: :exception end diff --git a/app/controllers/recipes_controller.rb b/app/controllers/recipes_controller.rb new file mode 100644 index 000000000..bc643dda0 --- /dev/null +++ b/app/controllers/recipes_controller.rb @@ -0,0 +1,31 @@ +require "recipe" +require "httparty" + +class RecipesController < ApplicationController + + + def search + @data = Recipe.all(params[:q], params[:base]) + end + + def index + random = ["chicken", "beef", "protein", "lasagne", "pasta", "low-fat"].shuffle + 5.times do |data| + @data = Recipe.all(params[random], params[:base]) + end + end + + + + def show + @data = Recipe.find(params[:label], params[:base]) + if @data == nil + return failed + end + end + + def popular + # if there is time i will implement this function + # @data = Recipe.find(params[:saved]) + end +end diff --git a/app/helpers/recipes_helper.rb b/app/helpers/recipes_helper.rb new file mode 100644 index 000000000..f526316e2 --- /dev/null +++ b/app/helpers/recipes_helper.rb @@ -0,0 +1,2 @@ +module RecipesHelper +end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index ea11a49d4..85eb02040 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -7,60 +7,39 @@ <%= javascript_include_tag "application", 'data-turbolinks-track' => true %> <%= csrf_meta_tags %> - -
    - - - <%= yield %> +
    + <%= yield %> -
    -
    -
    - <% Time.zone = "Pacific Time (US & Canada)" %> ThinkieDrinkieProductions © <%= copyright_notice_year_range(2016) %> All Rights Reserved. - <%= login_status %> +
  • <% Time.zone = "Pacific Time (US & Canada)" %> n.dot© // edamamAPI ©
    • -
    - - - +
    + + diff --git a/app/views/recipes/index.html.erb b/app/views/recipes/index.html.erb index f59b42bb8..866298b4d 100644 --- a/app/views/recipes/index.html.erb +++ b/app/views/recipes/index.html.erb @@ -1,37 +1,14 @@ -

    Ada Channels

    - -

    Your Recipes

    -<% if flash[:notice] %> -

    <%= flash[:notice] %>

    -<% end %> -
    -<% sections = ['
    ', - '
    ', - '
    '] %> - -<% counter = 0 %> -<% max = @data.length / 3 + 1 %> -<% @data.each do |data| %> - <% if counter % max == 0 %> - <%= sections[counter / max].html_safe %> -
      - <% end %> - <% counter += 1 %> -
    • <%= link_to data.name, new_message_path(data.name, data.id) %>
      • - - <% if counter % max == 0 %> -
    -
    - <% end %> -<% end %> - <% if counter % max != 0 %> - -
    -<% end %> -
    -<% sections = ['
    ', - '
    ', - '
    '] %> -<%if spanish_path %> - +
    +

    Welcome

    +
    +
    + <% if @data != nil %> + <% @data.each do |data| %> +
  • <%=image_tag data["image"]%>
    • +
    <%=link_to data["label"], recipe_path(data["label"]), method: :get, class:"button small hollow"%>
    + <% end %> + <% end %> + +
    +
    diff --git a/app/views/recipes/popular.html.erb b/app/views/recipes/popular.html.erb new file mode 100644 index 000000000..260c7fb48 --- /dev/null +++ b/app/views/recipes/popular.html.erb @@ -0,0 +1,2 @@ +

    Your favorite Recipes

    +

    <%= data["label"] %>

    diff --git a/app/views/recipes/search.html.erb b/app/views/recipes/search.html.erb new file mode 100644 index 000000000..ddc8ea4aa --- /dev/null +++ b/app/views/recipes/search.html.erb @@ -0,0 +1,36 @@ +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    + <%=link_to "Next", "/recipes/search/w?base=#{(params[:base].to_i+10)}&q=#{params[:q]}", method: :get, class:"button small expanded hollow"%> +
    +
    +
    + <% if @data != nil %> + <% @data.each do |data| %> +
    +
  • <%=image_tag data["image"]%>
    • +
    + +
    + <%= link_to "Share", data["shareAs"], method: :get, class:"button small expanded hollow" %> + <%=link_to data["label"], recipe_path(data["label"]), method: :get, class:"button small expanded hollow"%> +
    + <% end %> + <% end %> + +
    +
    +
    + <%=link_to "Next", "/recipes/search/w?base=#{(params[:base].to_i+10)}&q=#{params[:q]}", method: :get, class:"button small expanded hollow"%> +
    +
    +
    +
    diff --git a/app/views/recipes/show.html.erb b/app/views/recipes/show.html.erb index e69de29bb..6a2f0ee36 100644 --- a/app/views/recipes/show.html.erb +++ b/app/views/recipes/show.html.erb @@ -0,0 +1,43 @@ +
    + <% if @data %> +

    <%= @data["label"] %>

    +
    +
    +
  • <%=image_tag @data["image"]%>
    • + + <% if @data["dietLabels"] %> + <% @data["dietLabels"].each do |label| %> +
  • <%= label %>
    • + <% end %> + <% end %> + <% if @data["healthLabels"] %> + <% @data["healthLabels"].each do |label| %> +
  • <%= label %>
    • + <% end %> + <% end %> + <% serving = ((@data["calories"]).to_i / (@data["yield"]).to_i) %> +
  • Total Calories (kcals): <%= @data["calories"].to_i %>Calories per serving: <%= serving %>
    • +
    + + +
    + <% @data["ingredients"].each do |ingredient| %> +
  • <%= ingredient["quantity"] %> <%= ingredient["measure"] %> <%= ingredient["food"] %>
    • + <% end %> + <% end %> +
    +
    + +
    + +
    + + + <%= link_to "Share", @data["shareAs"], method: :get, class:"button small expanded hollow" %> +
    +
    + <%=link_to "See original source", @data["url"], method: :get, class:"button small expanded hollow"%> + +
    +
    +
    diff --git a/app/views/recipes/start.html.erb b/app/views/recipes/start.html.erb new file mode 100644 index 000000000..e8d8501ac --- /dev/null +++ b/app/views/recipes/start.html.erb @@ -0,0 +1,21 @@ + +
    +

    It's high time you find the food that nourishes you. . . Let's get started

    +

    Discover on your own with search, or browse -- no pressure or anything but you eat EVERYday... Eat well.

    +
    + + +
    + <% @data.each do |one| %> +
    +
  • <%=image_tag one.image, rwidth: '150', rheight: '150'%>
    • + <%=link_to "Take a peak", recipe_path(one.label), method: :get, class:"button small expanded hollow"%> +
    +<%end %> + +<% @data.each do |one| %> +
    +
  • <%=image_tag one.image, rwidth: '150', rheight: '150'%>
    • +<%=link_to "Take a peak", recipe_path(one.label), method: :get, class:"button small expanded hollow"%> +
    +<%end %> diff --git a/config/routes.rb b/config/routes.rb index 11769b1b7..f42709238 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,14 +1,23 @@ Rails.application.routes.draw do - root 'welcome/index' - get 'welcome/index', to: 'welcome#index' - get 'welcome/show', to: 'welcome#show' - get 'recipequery/index', to: 'recipequery#index' - get 'recipequery/show/:id', to: 'recipequery#show' + ##the page all users will land on + #CONTENT + ##I will need for pop path, to create a short form allowing the user to save recipes to the db + ##this page will have 1. the nav bar, 2. some images, 3. an index of the first 10 results including [link to show, image, label] + root 'recipes#index' + ##this page will have 2. [image, recipe, ingredients, ...link to url/uri] + get 'recipes/show/:label', to: 'recipes#show', as: 'recipe' + ##this page will not technically exist, other than as a controller route for the query method + get 'recipes/search/:w', to: 'recipes#search', as: 'search' + ##this page serves to populate the index/homepage when the user has not submitted a query or the search has been reset + get 'recipes/start', to: 'recipes#start', as: 'start' + ##this page will contain any recipes that the user have checked 'save this recipe' + get 'recipes/popular', to: 'recipes#popular', as: 'pop' +end # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". # You can have the root of your site routed with "root" - # root 'welcome#index' + # root 'recipes#index' # Example of regular route: # get 'products/:id' => 'catalog#view' @@ -57,5 +66,3 @@ # # Directs /admin/products/* to Admin::ProductsController # # (app/controllers/admin/products_controller.rb) # resources :products - # end -end diff --git a/app/views/welcome/index.html.erb b/documents/adaprojects/APIapp/assets/images/.keep similarity index 100% rename from app/views/welcome/index.html.erb rename to documents/adaprojects/APIapp/assets/images/.keep diff --git a/documents/adaprojects/APIapp/assets/stylesheets/application.scss b/documents/adaprojects/APIapp/assets/stylesheets/application.scss new file mode 100644 index 000000000..c91b644d8 --- /dev/null +++ b/documents/adaprojects/APIapp/assets/stylesheets/application.scss @@ -0,0 +1,113 @@ +/* + * This is a manifest file that'll be compiled into application.css, which will include all the files + * listed below. + * + * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, + * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path. + * + * You're free to add application-wide styles to this file and they'll appear at the bottom of the + * compiled file so the styles you add here take precedence over styles defined in any styles + * defined in the other CSS/SCSS files in this directory. It is generally better to create a new + * file per style scope. + * + *= require_tree . + *= require_self + //= require foundation_and_overrides + */ + h1, h2, h3, h4, h5, p{ + font: italic bold 20px Georgia, serif; + + } + h1,a{ + font: italic bold 20px Georgia, serif; + display: inline-grid; + } + + img.thumbnail{ + display: inline-block; + align-items: center; + width: 200px; + height: 220px; + border: solid 3px navy; + } + h1.AllList{ + background-color: deepskyblue; + font: italic bold 12px/20px Georgia, serif; + width: 100%; + } + .footer{ + background-color: deepskyblue; + content-align: center; + font-color: #D8D16F; + width: 100%; + height: 100%; + border-width: medium; + } + a.button { + margin-left: 5%; + margin-right: 4%; + align-items: center; + padding: 20px; + font-size: 1em; + white-space: nowrap; + display: inline-grid; + background-color: deepskyblue; + font: italic 12px Georgia; + } + + div.top-bar:hover, a.button:hover{ + text-decoration: none; + list-style-type: none; + background-color: navy; + } + + .errors { + color: aqua; + } + + div.callout.small{ + content-align: center; + border-color: #D8D16F; + border-width: medium; + } + + div.row.column{ + font: italic bold 12px/20px Georgia, serif; + width:100%; + display: inline-grid; + text-decoration: none; + list-style-type: none; + } + + h1.row.text-center, h2.row.text-center, h3.subheader{ + font: italic 35px Georgia, serif; + } + + div.top-bar, a.button{ + background-color: deepskyblue; + text-decoration: none; + list-style-type: none; + padding: 15px, 8px; + text-align: justify; + display: inline-grid; + background-color: deepskyblue; + } + + ul.menu{ + border-style: solid; + font: italic bold 12px/20px Georgia, serif; + display: inline-grid; + padding: 20px, 40px; + background-color: deepskyblue; + content-align: center; + border-color: #D8D16F; + border-width: medium; + margin: 10px; + } + + .container, .body{ + font: italic bold 12px/20px Georgia, serif; + width: 100%; + text-decoration: none; + list-style-type: none; + } diff --git a/documents/adaprojects/APIapp/controllers/RecipesController.rb b/documents/adaprojects/APIapp/controllers/RecipesController.rb new file mode 100644 index 000000000..717dc4ef0 --- /dev/null +++ b/documents/adaprojects/APIapp/controllers/RecipesController.rb @@ -0,0 +1,30 @@ + +require "httparty" +require "recipe" +class RecipesController < ApplicationController + + def search + @data = Recipe.all(params[:q], params[:base]) + end + + def index + random = ["chicken", "beef", "protein", "lasagne", "pasta", "low-fat"].shuffle + 5.times do |data| + @data = Recipe.all(params[random], params[:base]) + end + end + + + + def show + @data = Recipe.find(params[:label], params[:base]) + if @data == nil + return failed + end + end + + def popular + # if there is time i will implement this function + # @data = Recipe.find(params[:saved]) + end +end diff --git a/documents/adaprojects/APIapp/controllers/application_controller.rb b/documents/adaprojects/APIapp/controllers/application_controller.rb new file mode 100644 index 000000000..d83690e1b --- /dev/null +++ b/documents/adaprojects/APIapp/controllers/application_controller.rb @@ -0,0 +1,5 @@ +class ApplicationController < ActionController::Base + # Prevent CSRF attacks by raising an exception. + # For APIs, you may want to use :null_session instead. + protect_from_forgery with: :exception +end diff --git a/app/views/welcome/show.html.erb b/documents/adaprojects/APIapp/controllers/concerns/.keep similarity index 100% rename from app/views/welcome/show.html.erb rename to documents/adaprojects/APIapp/controllers/concerns/.keep diff --git a/documents/adaprojects/APIapp/helpers/application_helper.rb b/documents/adaprojects/APIapp/helpers/application_helper.rb new file mode 100644 index 000000000..de6be7945 --- /dev/null +++ b/documents/adaprojects/APIapp/helpers/application_helper.rb @@ -0,0 +1,2 @@ +module ApplicationHelper +end diff --git a/documents/adaprojects/APIapp/mailers/.keep b/documents/adaprojects/APIapp/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/documents/adaprojects/APIapp/models/.keep b/documents/adaprojects/APIapp/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/documents/adaprojects/APIapp/models/concerns/.keep b/documents/adaprojects/APIapp/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/documents/adaprojects/APIapp/views/layouts/application.html.erb b/documents/adaprojects/APIapp/views/layouts/application.html.erb new file mode 100644 index 000000000..ea11a49d4 --- /dev/null +++ b/documents/adaprojects/APIapp/views/layouts/application.html.erb @@ -0,0 +1,66 @@ + + + + + + <%= stylesheet_link_tag "application" %> + <%= javascript_include_tag "application", 'data-turbolinks-track' => true %> + <%= csrf_meta_tags %> + + + +
    + + + <%= yield %> + + + + +
    +
    + +
    + <% Time.zone = "Pacific Time (US & Canada)" %> ThinkieDrinkieProductions © <%= copyright_notice_year_range(2016) %> All Rights Reserved. + <%= login_status %> +
    +
    +
    +
    + + diff --git a/documents/adaprojects/APIapp/views/recipes/index.html.erb b/documents/adaprojects/APIapp/views/recipes/index.html.erb new file mode 100644 index 000000000..f59b42bb8 --- /dev/null +++ b/documents/adaprojects/APIapp/views/recipes/index.html.erb @@ -0,0 +1,37 @@ +

    Ada Channels

    + +

    Your Recipes

    +<% if flash[:notice] %> +

    <%= flash[:notice] %>

    +<% end %> +
    +<% sections = ['
    ', + '
    ', + '
    '] %> + +<% counter = 0 %> +<% max = @data.length / 3 + 1 %> +<% @data.each do |data| %> + <% if counter % max == 0 %> + <%= sections[counter / max].html_safe %> +
      + <% end %> + <% counter += 1 %> +
    • <%= link_to data.name, new_message_path(data.name, data.id) %>
      • + + <% if counter % max == 0 %> +
    +
    + <% end %> +<% end %> + <% if counter % max != 0 %> + +
    +<% end %> +
    +<% sections = ['
    ', + '
    ', + '
    '] %> +<%if spanish_path %> + +
    diff --git a/documents/adaprojects/APIapp/views/recipes/show.html.erb b/documents/adaprojects/APIapp/views/recipes/show.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/documents/adaprojects/APIapp/views/welcome/index.html.erb b/documents/adaprojects/APIapp/views/welcome/index.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/documents/adaprojects/APIapp/views/welcome/show.html.erb b/documents/adaprojects/APIapp/views/welcome/show.html.erb new file mode 100644 index 000000000..e69de29bb From d04f0fc2ecf2180f1f2a4345dddc0db80a6166c4 Mon Sep 17 00:00:00 2001 From: Natasha Ewing Date: Mon, 7 Nov 2016 00:01:27 -0800 Subject: [PATCH 11/11] added all the files from my local directory to github repo. --- lib/recipe.rb | 67 +++++++++++++++++++++------------------------------ 1 file changed, 27 insertions(+), 40 deletions(-) diff --git a/lib/recipe.rb b/lib/recipe.rb index ef1077374..4dd9b905f 100644 --- a/lib/recipe.rb +++ b/lib/recipe.rb @@ -1,52 +1,39 @@ +require 'httparty' + class Recipe + BASE_URL = "https://api.edamam.com/search?q=" + TOKEN = ENV["TOKEN"] + ID = ENV["ID"] - attr_reader :name, :id, :label, :recipe, :image - - def initialize(name, id, options = {} ) - # Commented out because there's no way I'd be able to remember - # all this live. - # @purpose = options[:purpose] - # @is_archived = options[:is_archived] - # @is_general = options[:is_archived] - # @members = options[:members] - @name = name - @id = id - end - # Send a message to this slack channel - # Returns the data from the Slack server's response - def show + def initialize end - # Create a class-level instance variable. - # Musch more likely to work as expected than a class variable - # See http://www.railstips.org/blog/archives/2006/11/18/class-and-instance-variables-in-ruby/ - class << self - attr_reader :channels - end - - # class << self, an instance variable we have access to "Channel.channels", another way of writing a function self.all + def self.all(q,base) #q to and from increment + basei = 0 + if base != nil + basei = base.to_i + end - # Return a memoized set of all channels - def self.all - SlackApiWrapper.listchannels + url = BASE_URL + "#{q}&app_id=#{ID}&app_key=#{TOKEN}&from=#{basei}&to=#{(basei+10)}" + data = HTTParty.get(url) + dataSet = [] + if data["hits"] + data["hits"].each do |current| + wrapper = current["recipe"] + dataSet << wrapper + end + end + return dataSet end - # Foreget all memoized values - def self.reset - end + def self.reset; end - # Return either the first (probably only) channel matching - # the given name, or nil. - def self.by_name(name) - matches = all.select do |c| - c.name == name - end - return matches.first - end + # Return a memoized set of all recipes? - # Return either the first (probably only) channel matching - # the given ID, or nil. - def self.by_id(id) + #Return a single recipe for show page + def self.find(label, base) + match = self.all(label, base) + return match.first end end