diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..2afab5d222 --- /dev/null +++ b/.gitignore @@ -0,0 +1,23 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +/node_modules +/yarn-error.log + +.byebug_history + +.env + +coverage diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000000..989522b15e --- /dev/null +++ b/Gemfile @@ -0,0 +1,73 @@ +source 'https://rubygems.org' + +git_source(:github) do |repo_name| + repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/") + "https://github.com/#{repo_name}.git" +end + + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.1.4' +# Use postgresql as the database for Active Record +gem 'pg', '~> 0.18' +# Use Puma as the app server +gem 'puma', '~> 3.7' +# Use SCSS for stylesheets +gem 'sass-rails', '~> 5.0' +# Use Uglifier as compressor for JavaScript assets +gem 'uglifier', '>= 1.3.0' +# See https://github.com/rails/execjs#readme for more supported runtimes +# gem 'therubyracer', platforms: :ruby + +# Use CoffeeScript for .coffee assets and views +# gem 'coffee-rails', '~> 4.2' +# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks +gem 'turbolinks', '~> 5' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 3.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' +gem 'foundation-rails', '6.4.1.2' +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] + # Adds support for Capybara system testing and selenium driver + gem 'capybara', '~> 2.13' + gem 'selenium-webdriver' +end + +group :development do + gem 'dotenv-rails' + # Access an IRB console on exception pages or by using <%= console %> anywhere in the code. + gem 'web-console', '>= 3.3.0' + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +gem 'jquery-turbolinks' +group :development do + gem 'better_errors' + gem 'pry-rails' + gem 'binding_of_caller' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' + gem 'pry-rails' + gem 'simplecov', :require => false +end + +gem 'omniauth' +gem 'omniauth-github' diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000000..4cdde46102 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,268 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.1.4) + actionpack (= 5.1.4) + nio4r (~> 2.0) + websocket-driver (~> 0.6.1) + actionmailer (5.1.4) + actionpack (= 5.1.4) + actionview (= 5.1.4) + activejob (= 5.1.4) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.1.4) + actionview (= 5.1.4) + activesupport (= 5.1.4) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.1.4) + activesupport (= 5.1.4) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.1.4) + activesupport (= 5.1.4) + globalid (>= 0.3.6) + activemodel (5.1.4) + activesupport (= 5.1.4) + activerecord (5.1.4) + activemodel (= 5.1.4) + activesupport (= 5.1.4) + arel (~> 8.0) + activesupport (5.1.4) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (~> 0.7) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + ansi (1.5.0) + arel (8.0.0) + babel-source (5.8.35) + babel-transpiler (0.7.0) + babel-source (>= 4.0, < 6) + execjs (~> 2.0) + better_errors (2.4.0) + coderay (>= 1.0.0) + erubi (>= 1.0.0) + rack (>= 0.9.0) + bindex (0.5.0) + binding_of_caller (0.7.2) + debug_inspector (>= 0.0.1) + builder (3.2.3) + byebug (9.1.0) + capybara (2.15.4) + addressable + mini_mime (>= 0.1.3) + nokogiri (>= 1.3.3) + rack (>= 1.0.0) + rack-test (>= 0.5.4) + xpath (~> 2.0) + childprocess (0.8.0) + ffi (~> 1.0, >= 1.0.11) + coderay (1.1.2) + concurrent-ruby (1.0.5) + crass (1.0.2) + debug_inspector (0.0.3) + docile (1.1.5) + dotenv (2.2.1) + dotenv-rails (2.2.1) + dotenv (= 2.2.1) + railties (>= 3.2, < 5.2) + erubi (1.7.0) + execjs (2.7.0) + faraday (0.12.2) + multipart-post (>= 1.2, < 3) + ffi (1.9.18) + foundation-rails (6.4.1.2) + railties (>= 3.1.0) + sass (>= 3.3.0, < 3.5) + sprockets-es6 (>= 0.9.0) + globalid (0.4.0) + activesupport (>= 4.2.0) + hashie (3.5.6) + i18n (0.9.0) + concurrent-ruby (~> 1.0) + jbuilder (2.7.0) + activesupport (>= 4.2.0) + multi_json (>= 1.2) + jquery-turbolinks (2.1.0) + railties (>= 3.1.0) + turbolinks + json (2.1.0) + jwt (1.5.6) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.1.1) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.6.6) + mime-types (>= 1.16, < 4) + method_source (0.9.0) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mini_mime (0.1.4) + mini_portile2 (2.3.0) + minitest (5.10.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.1.18) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + multi_json (1.12.2) + multi_xml (0.6.0) + multipart-post (2.0.0) + nio4r (2.1.0) + nokogiri (1.8.1) + mini_portile2 (~> 2.3.0) + oauth2 (1.4.0) + faraday (>= 0.8, < 0.13) + jwt (~> 1.0) + multi_json (~> 1.3) + multi_xml (~> 0.5) + rack (>= 1.2, < 3) + omniauth (1.7.1) + hashie (>= 3.4.6, < 3.6.0) + rack (>= 1.6.2, < 3) + omniauth-github (1.3.0) + omniauth (~> 1.5) + omniauth-oauth2 (>= 1.4.0, < 2.0) + omniauth-oauth2 (1.4.0) + oauth2 (~> 1.0) + omniauth (~> 1.2) + pg (0.21.0) + pry (0.11.1) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.6) + pry (>= 0.10.4) + public_suffix (3.0.0) + puma (3.10.0) + rack (2.0.3) + rack-test (0.7.0) + rack (>= 1.0, < 3) + rails (5.1.4) + actioncable (= 5.1.4) + actionmailer (= 5.1.4) + actionpack (= 5.1.4) + actionview (= 5.1.4) + activejob (= 5.1.4) + activemodel (= 5.1.4) + activerecord (= 5.1.4) + activesupport (= 5.1.4) + bundler (>= 1.3.0) + railties (= 5.1.4) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.3) + loofah (~> 2.0) + railties (5.1.4) + actionpack (= 5.1.4) + activesupport (= 5.1.4) + method_source + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (12.1.0) + rb-fsevent (0.10.2) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + ruby-progressbar (1.9.0) + ruby_dep (1.5.0) + rubyzip (1.2.1) + sass (3.4.25) + 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) + selenium-webdriver (3.6.0) + childprocess (~> 0.5) + rubyzip (~> 1.0) + simplecov (0.15.1) + docile (~> 1.1.0) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.2) + spring (2.0.2) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.1) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-es6 (0.9.2) + babel-source (>= 5.8.11) + babel-transpiler + sprockets (>= 3.0.0) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.0) + thread_safe (0.3.6) + tilt (2.0.8) + turbolinks (5.0.1) + turbolinks-source (~> 5) + turbolinks-source (5.0.3) + tzinfo (1.2.3) + thread_safe (~> 0.1) + uglifier (3.2.0) + execjs (>= 0.3.0, < 3) + web-console (3.5.1) + actionview (>= 5.0) + activemodel (>= 5.0) + bindex (>= 0.4.0) + railties (>= 5.0) + websocket-driver (0.6.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) + xpath (2.1.0) + nokogiri (~> 1.3) + +PLATFORMS + ruby + +DEPENDENCIES + better_errors + binding_of_caller + byebug + capybara (~> 2.13) + dotenv-rails + foundation-rails (= 6.4.1.2) + jbuilder (~> 2.5) + jquery-turbolinks + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + omniauth + omniauth-github + pg (~> 0.18) + pry-rails + puma (~> 3.7) + rails (~> 5.1.4) + sass-rails (~> 5.0) + selenium-webdriver + simplecov + spring + spring-watcher-listen (~> 2.0.0) + turbolinks (~> 5) + tzinfo-data + uglifier (>= 1.3.0) + web-console (>= 3.3.0) + +BUNDLED WITH + 1.16.0.pre.3 diff --git a/README.md b/README.md index 1b10607db1..fdd9b85a71 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,8 @@ This is a [Stage 3](https://github.com/Ada-Developers-Academy/pedagogy/blob/mast - Controllers - Models - Views -- User based application logic -- User authentication +- Merchant based application logic +- Merchant authentication - Agile practices - Feature branch management with Git - Group project ownership @@ -32,7 +32,7 @@ This is a [Stage 3](https://github.com/Ada-Developers-Academy/pedagogy/blob/mast 1. Do you want to use git branches? Pull requests? 1. Determine who will be the Stand Up Leader and Task Leader for the first week 1. Create a Trello board and ensure that all team members and instructors have access -1. Review the User Stories below and create Trello tasks to represent them +1. Review the Merchant Stories below and create Trello tasks to represent them 1. Slack your team name, app name, and link to your trello board to your Project Manager ## Expectations @@ -45,8 +45,8 @@ Build an online system for listing, selling, reviewing, and buying a wide variet - Test code coverage (using SimpleCov - remember me!) - 90% for all controller and model classes -### User Stories -#### Guest User (Unauthenticated) +### Merchant Stories +#### Guest Merchant (Unauthenticated) As a guest to the website (not signed in) I **can**: - Browse all products @@ -87,7 +87,7 @@ As a guest I **cannot**: - View any link or page to manage any products - View any of the account pages -#### Authenticated Users +#### Authenticated Merchants As a signed-in user, I **can**: - Do everything a guest user can do except for sign up and sign in @@ -132,8 +132,8 @@ As a signed-in user, I **cannot**: Many of our models will have attributes that are required for our application to use and display data consistently. Each model will have attributes with requirements for a valid record. The requirements are summarized below: #### Merchant -- Username must be present -- Username must be unique +- Merchantname must be present +- Merchantname must be unique - Email Address must be present - Email Address must be unique @@ -143,7 +143,7 @@ Many of our models will have attributes that are required for our application to - Price must be present - Price must be a number - Price must be greater than 0 -- Product must belong to a User +- Product must belong to a Merchant #### Order - An Order must have one or more Order Items diff --git a/Rakefile b/Rakefile new file mode 100644 index 0000000000..e85f913914 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js new file mode 100644 index 0000000000..b16e53d6d5 --- /dev/null +++ b/app/assets/config/manifest.js @@ -0,0 +1,3 @@ +//= link_tree ../images +//= link_directory ../javascripts .js +//= link_directory ../stylesheets .css diff --git a/app/assets/images/.keep b/app/assets/images/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js new file mode 100644 index 0000000000..d8cf1705b9 --- /dev/null +++ b/app/assets/javascripts/application.js @@ -0,0 +1,20 @@ +// This is a manifest file that'll be compiled into application.js, which will include all the files +// listed below. +// +// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, or any plugin's +// vendor/assets/javascripts directory can be referenced here using a relative path. +// +// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the +// compiled file. JavaScript code in this file should be added after the last require_* statement. +// +// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details +// about supported directives. +// +//= require rails-ujs +//= require foundation +//= require turbolinks +//= require_tree . + + + +$(function(){ $(document).foundation(); }); diff --git a/app/assets/javascripts/cable.js b/app/assets/javascripts/cable.js new file mode 100644 index 0000000000..739aa5f022 --- /dev/null +++ b/app/assets/javascripts/cable.js @@ -0,0 +1,13 @@ +// Action Cable provides the framework to deal with WebSockets in Rails. +// You can generate new channels where WebSocket features live using the `rails generate channel` command. +// +//= require action_cable +//= require_self +//= require_tree ./channels + +(function() { + this.App || (this.App = {}); + + App.cable = ActionCable.createConsumer(); + +}).call(this); diff --git a/app/assets/javascripts/categories.js b/app/assets/javascripts/categories.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/categories.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/javascripts/channels/.keep b/app/assets/javascripts/channels/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/assets/javascripts/merchants.js b/app/assets/javascripts/merchants.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/merchants.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/javascripts/orders.js b/app/assets/javascripts/orders.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/orders.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/javascripts/orders_products.js b/app/assets/javascripts/orders_products.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/orders_products.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/javascripts/products.js b/app/assets/javascripts/products.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/products.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/javascripts/reviews.js b/app/assets/javascripts/reviews.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/reviews.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/javascripts/sessions.js b/app/assets/javascripts/sessions.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/sessions.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/stylesheets/_settings.scss b/app/assets/stylesheets/_settings.scss new file mode 100644 index 0000000000..b67ff00cdc --- /dev/null +++ b/app/assets/stylesheets/_settings.scss @@ -0,0 +1,863 @@ +// Foundation for Sites Settings +// ----------------------------- +// +// Table of Contents: +// +// 1. Global +// 2. Breakpoints +// 3. The Grid +// 4. Base Typography +// 5. Typography Helpers +// 6. Abide +// 7. Accordion +// 8. Accordion Menu +// 9. Badge +// 10. Breadcrumbs +// 11. Button +// 12. Button Group +// 13. Callout +// 14. Card +// 15. Close Button +// 16. Drilldown +// 17. Dropdown +// 18. Dropdown Menu +// 19. Flexbox Utilities +// 20. Forms +// 21. Label +// 22. Media Object +// 23. Menu +// 24. Meter +// 25. Off-canvas +// 26. Orbit +// 27. Pagination +// 28. Progress Bar +// 29. Prototype Arrow +// 30. Prototype Border-Box +// 31. Prototype Border-None +// 32. Prototype Bordered +// 33. Prototype Display +// 34. Prototype Font-Styling +// 35. Prototype List-Style-Type +// 36. Prototype Overflow +// 37. Prototype Position +// 38. Prototype Rounded +// 39. Prototype Separator +// 40. Prototype Shadow +// 41. Prototype Sizing +// 42. Prototype Spacing +// 43. Prototype Text-Decoration +// 44. Prototype Text-Transformation +// 45. Prototype Text-Utilities +// 46. Responsive Embed +// 47. Reveal +// 48. Slider +// 49. Switch +// 50. Table +// 51. Tabs +// 52. Thumbnail +// 53. Title Bar +// 54. Tooltip +// 55. Top Bar +// 56. Xy Grid + +@import 'util/util'; + +// 1. Global +// --------- + +$global-font-size: 100%; +$global-width: rem-calc(1200); +$global-lineheight: 1.5; +$foundation-palette: ( + primary: #1779ba, + secondary: #767676, + success: #3adb76, + warning: #ffae00, + alert: #cc4b37, +); +$light-gray: #e6e6e6; +$medium-gray: #cacaca; +$dark-gray: #8a8a8a; +$black: #0a0a0a; +$white: #fefefe; +$body-background: $white; +$body-font-color: $black; +$body-font-family: 'Helvetica Neue', Helvetica, Roboto, Arial, sans-serif; +$body-antialiased: true; +$global-margin: 1rem; +$global-padding: 1rem; +$global-position: 1rem; +$global-weight-normal: normal; +$global-weight-bold: bold; +$global-radius: 0; +$global-menu-padding: 0.7rem 1rem; +$global-menu-nested-margin: 1rem; +$global-text-direction: ltr; +$global-flexbox: true; +$global-prototype-breakpoints: false; +$global-color-pick-contrast-tolerance: 0; +$print-transparent-backgrounds: true; + +@include add-foundation-colors; + +// 2. Breakpoints +// -------------- + +$breakpoints: ( + small: 0, + medium: 640px, + large: 1024px, + xlarge: 1200px, + xxlarge: 1440px, +); +$print-breakpoint: large; +$breakpoint-classes: (small medium large); + +// 3. The Grid +// ----------- + +$grid-row-width: $global-width; +$grid-column-count: 12; +$grid-column-gutter: ( + small: 20px, + medium: 30px, +); +$grid-column-align-edge: true; +$grid-column-alias: 'columns'; +$block-grid-max: 8; + +// 4. Base Typography +// ------------------ + +$header-font-family: $body-font-family; +$header-font-weight: $global-weight-normal; +$header-font-style: normal; +$font-family-monospace: Consolas, 'Liberation Mono', Courier, monospace; +$header-color: inherit; +$header-lineheight: 1.4; +$header-margin-bottom: 0.5rem; +$header-styles: ( + small: ( + 'h1': ('font-size': 24), + 'h2': ('font-size': 20), + 'h3': ('font-size': 19), + 'h4': ('font-size': 18), + 'h5': ('font-size': 17), + 'h6': ('font-size': 16), + ), + medium: ( + 'h1': ('font-size': 48), + 'h2': ('font-size': 40), + 'h3': ('font-size': 31), + 'h4': ('font-size': 25), + 'h5': ('font-size': 20), + 'h6': ('font-size': 16), + ), +); +$header-text-rendering: optimizeLegibility; +$small-font-size: 80%; +$header-small-font-color: $medium-gray; +$paragraph-lineheight: 1.6; +$paragraph-margin-bottom: 1rem; +$paragraph-text-rendering: optimizeLegibility; +$code-color: $black; +$code-font-family: $font-family-monospace; +$code-font-weight: $global-weight-normal; +$code-background: $light-gray; +$code-border: 1px solid $medium-gray; +$code-padding: rem-calc(2 5 1); +$anchor-color: $primary-color; +$anchor-color-hover: scale-color($anchor-color, $lightness: -14%); +$anchor-text-decoration: none; +$anchor-text-decoration-hover: none; +$hr-width: $global-width; +$hr-border: 1px solid $medium-gray; +$hr-margin: rem-calc(20) auto; +$list-lineheight: $paragraph-lineheight; +$list-margin-bottom: $paragraph-margin-bottom; +$list-style-type: disc; +$list-style-position: outside; +$list-side-margin: 1.25rem; +$list-nested-side-margin: 1.25rem; +$defnlist-margin-bottom: 1rem; +$defnlist-term-weight: $global-weight-bold; +$defnlist-term-margin-bottom: 0.3rem; +$blockquote-color: $dark-gray; +$blockquote-padding: rem-calc(9 20 0 19); +$blockquote-border: 1px solid $medium-gray; +$cite-font-size: rem-calc(13); +$cite-color: $dark-gray; +$cite-pseudo-content: '\2014 \0020'; +$keystroke-font: $font-family-monospace; +$keystroke-color: $black; +$keystroke-background: $light-gray; +$keystroke-padding: rem-calc(2 4 0); +$keystroke-radius: $global-radius; +$abbr-underline: 1px dotted $black; + +// 5. Typography Helpers +// --------------------- + +$lead-font-size: $global-font-size * 1.25; +$lead-lineheight: 1.6; +$subheader-lineheight: 1.4; +$subheader-color: $dark-gray; +$subheader-font-weight: $global-weight-normal; +$subheader-margin-top: 0.2rem; +$subheader-margin-bottom: 0.5rem; +$stat-font-size: 2.5rem; + +// 6. Abide +// -------- + +$abide-inputs: true; +$abide-labels: true; +$input-background-invalid: get-color(alert); +$form-label-color-invalid: get-color(alert); +$input-error-color: get-color(alert); +$input-error-font-size: rem-calc(12); +$input-error-font-weight: $global-weight-bold; + +// 7. Accordion +// ------------ + +$accordion-background: $white; +$accordion-plusminus: true; +$accordion-title-font-size: rem-calc(12); +$accordion-item-color: $primary-color; +$accordion-item-background-hover: $light-gray; +$accordion-item-padding: 1.25rem 1rem; +$accordion-content-background: $white; +$accordion-content-border: 1px solid $light-gray; +$accordion-content-color: $body-font-color; +$accordion-content-padding: 1rem; + +// 8. Accordion Menu +// ----------------- + +$accordionmenu-padding: $global-menu-padding; +$accordionmenu-nested-margin: $global-menu-nested-margin; +$accordionmenu-submenu-padding: $accordionmenu-padding; +$accordionmenu-arrows: true; +$accordionmenu-arrow-color: $primary-color; +$accordionmenu-item-background: null; +$accordionmenu-border: null; +$accordionmenu-submenu-toggle-background: null; +$accordion-submenu-toggle-border: $accordionmenu-border; +$accordionmenu-submenu-toggle-width: 40px; +$accordionmenu-submenu-toggle-height: $accordionmenu-submenu-toggle-width; +$accordionmenu-arrow-size: 6px; + +// 9. Badge +// -------- + +$badge-background: $primary-color; +$badge-color: $white; +$badge-color-alt: $black; +$badge-palette: $foundation-palette; +$badge-padding: 0.3em; +$badge-minwidth: 2.1em; +$badge-font-size: 0.6rem; + +// 10. Breadcrumbs +// --------------- + +$breadcrumbs-margin: 0 0 $global-margin 0; +$breadcrumbs-item-font-size: rem-calc(11); +$breadcrumbs-item-color: $primary-color; +$breadcrumbs-item-color-current: $black; +$breadcrumbs-item-color-disabled: $medium-gray; +$breadcrumbs-item-margin: 0.75rem; +$breadcrumbs-item-uppercase: true; +$breadcrumbs-item-separator: true; +$breadcrumbs-item-separator-item: '/'; +$breadcrumbs-item-separator-item-rtl: '\\'; +$breadcrumbs-item-separator-color: $medium-gray; + +// 11. Button +// ---------- + +$button-font-family: inherit; +$button-padding: 0.85em 1em; +$button-margin: 0 0 $global-margin 0; +$button-fill: solid; +$button-background: $primary-color; +$button-background-hover: scale-color($button-background, $lightness: -15%); +$button-color: $white; +$button-color-alt: $black; +$button-radius: $global-radius; +$button-hollow-border-width: 1px; +$button-sizes: ( + tiny: 0.6rem, + small: 0.75rem, + default: 0.9rem, + large: 1.25rem, +); +$button-palette: $foundation-palette; +$button-opacity-disabled: 0.25; +$button-background-hover-lightness: -20%; +$button-hollow-hover-lightness: -50%; +$button-transition: background-color 0.25s ease-out, color 0.25s ease-out; + +// 12. Button Group +// ---------------- + +$buttongroup-margin: 1rem; +$buttongroup-spacing: 1px; +$buttongroup-child-selector: '.button'; +$buttongroup-expand-max: 6; +$buttongroup-radius-on-each: true; + +// 13. Callout +// ----------- + +$callout-background: $white; +$callout-background-fade: 85%; +$callout-border: 1px solid rgba($black, 0.25); +$callout-margin: 0 0 1rem 0; +$callout-padding: 1rem; +$callout-font-color: $body-font-color; +$callout-font-color-alt: $body-background; +$callout-radius: $global-radius; +$callout-link-tint: 30%; + +// 14. Card +// -------- + +$card-background: $white; +$card-font-color: $body-font-color; +$card-divider-background: $light-gray; +$card-border: 1px solid $light-gray; +$card-shadow: none; +$card-border-radius: $global-radius; +$card-padding: $global-padding; +$card-margin-bottom: $global-margin; + +// 15. Close Button +// ---------------- + +$closebutton-position: right top; +$closebutton-offset-horizontal: ( + small: 0.66rem, + medium: 1rem, +); +$closebutton-offset-vertical: ( + small: 0.33em, + medium: 0.5rem, +); +$closebutton-size: ( + small: 1.5em, + medium: 2em, +); +$closebutton-lineheight: 1; +$closebutton-color: $dark-gray; +$closebutton-color-hover: $black; + +// 16. Drilldown +// ------------- + +$drilldown-transition: transform 0.15s linear; +$drilldown-arrows: true; +$drilldown-padding: $global-menu-padding; +$drilldown-nested-margin: 0; +$drilldown-background: $white; +$drilldown-submenu-padding: $drilldown-padding; +$drilldown-submenu-background: $white; +$drilldown-arrow-color: $primary-color; +$drilldown-arrow-size: 6px; + +// 17. Dropdown +// ------------ + +$dropdown-padding: 1rem; +$dropdown-background: $body-background; +$dropdown-border: 1px solid $medium-gray; +$dropdown-font-size: 1rem; +$dropdown-width: 300px; +$dropdown-radius: $global-radius; +$dropdown-sizes: ( + tiny: 100px, + small: 200px, + large: 400px, +); + +// 18. Dropdown Menu +// ----------------- + +$dropdownmenu-arrows: true; +$dropdownmenu-arrow-color: $anchor-color; +$dropdownmenu-arrow-size: 6px; +$dropdownmenu-arrow-padding: 1.5rem; +$dropdownmenu-min-width: 200px; +$dropdownmenu-background: $white; +$dropdownmenu-submenu-background: $dropdownmenu-background; +$dropdownmenu-padding: $global-menu-padding; +$dropdownmenu-nested-margin: 0; +$dropdownmenu-submenu-padding: $dropdownmenu-padding; +$dropdownmenu-border: 1px solid $medium-gray; +$dropdown-menu-item-color-active: get-color(primary); +$dropdown-menu-item-background-active: transparent; + +// 19. Flexbox Utilities +// --------------------- + +$flex-source-ordering-count: 6; +$flexbox-responsive-breakpoints: true; + +// 20. Forms +// --------- + +$fieldset-border: 1px solid $medium-gray; +$fieldset-padding: rem-calc(20); +$fieldset-margin: rem-calc(18 0); +$legend-padding: rem-calc(0 3); +$form-spacing: rem-calc(16); +$helptext-color: $black; +$helptext-font-size: rem-calc(13); +$helptext-font-style: italic; +$input-prefix-color: $black; +$input-prefix-background: $light-gray; +$input-prefix-border: 1px solid $medium-gray; +$input-prefix-padding: 1rem; +$form-label-color: $black; +$form-label-font-size: rem-calc(14); +$form-label-font-weight: $global-weight-normal; +$form-label-line-height: 1.8; +$select-background: $white; +$select-triangle-color: $dark-gray; +$select-radius: $global-radius; +$input-color: $black; +$input-placeholder-color: $medium-gray; +$input-font-family: inherit; +$input-font-size: rem-calc(16); +$input-font-weight: $global-weight-normal; +$input-line-height: $global-lineheight; +$input-background: $white; +$input-background-focus: $white; +$input-background-disabled: $light-gray; +$input-border: 1px solid $medium-gray; +$input-border-focus: 1px solid $dark-gray; +$input-padding: $form-spacing / 2; +$input-shadow: inset 0 1px 2px rgba($black, 0.1); +$input-shadow-focus: 0 0 5px $medium-gray; +$input-cursor-disabled: not-allowed; +$input-transition: box-shadow 0.5s, border-color 0.25s ease-in-out; +$input-number-spinners: true; +$input-radius: $global-radius; +$form-button-radius: $global-radius; + +// 21. Label +// --------- + +$label-background: $primary-color; +$label-color: $white; +$label-color-alt: $black; +$label-palette: $foundation-palette; +$label-font-size: 0.8rem; +$label-padding: 0.33333rem 0.5rem; +$label-radius: $global-radius; + +// 22. Media Object +// ---------------- + +$mediaobject-margin-bottom: $global-margin; +$mediaobject-section-padding: $global-padding; +$mediaobject-image-width-stacked: 100%; + +// 23. Menu +// -------- + +$menu-margin: 0; +$menu-nested-margin: $global-menu-nested-margin; +$menu-items-padding: $global-menu-padding; +$menu-simple-margin: 1rem; +$menu-item-color-active: $white; +$menu-item-background-active: get-color(primary); +$menu-icon-spacing: 0.25rem; +$menu-item-background-hover: $light-gray; +$menu-state-back-compat: true; +$menu-centered-back-compat: true; + +// 24. Meter +// --------- + +$meter-height: 1rem; +$meter-radius: $global-radius; +$meter-background: $medium-gray; +$meter-fill-good: $success-color; +$meter-fill-medium: $warning-color; +$meter-fill-bad: $alert-color; + +// 25. Off-canvas +// -------------- + +$offcanvas-size: 250px; +$offcanvas-vertical-size: 250px; +$offcanvas-background: $light-gray; +$offcanvas-shadow: 0 0 10px rgba($black, 0.7); +$offcanvas-inner-shadow-size: 20px; +$offcanvas-inner-shadow-color: rgba($black, 0.25); +$offcanvas-overlay-zindex: 11; +$offcanvas-push-zindex: 12; +$offcanvas-overlap-zindex: 13; +$offcanvas-reveal-zindex: 12; +$offcanvas-transition-length: 0.5s; +$offcanvas-transition-timing: ease; +$offcanvas-fixed-reveal: true; +$offcanvas-exit-background: rgba($white, 0.25); +$maincontent-class: 'off-canvas-content'; + +// 26. Orbit +// --------- + +$orbit-bullet-background: $medium-gray; +$orbit-bullet-background-active: $dark-gray; +$orbit-bullet-diameter: 1.2rem; +$orbit-bullet-margin: 0.1rem; +$orbit-bullet-margin-top: 0.8rem; +$orbit-bullet-margin-bottom: 0.8rem; +$orbit-caption-background: rgba($black, 0.5); +$orbit-caption-padding: 1rem; +$orbit-control-background-hover: rgba($black, 0.5); +$orbit-control-padding: 1rem; +$orbit-control-zindex: 10; + +// 27. Pagination +// -------------- + +$pagination-font-size: rem-calc(14); +$pagination-margin-bottom: $global-margin; +$pagination-item-color: $black; +$pagination-item-padding: rem-calc(3 10); +$pagination-item-spacing: rem-calc(1); +$pagination-radius: $global-radius; +$pagination-item-background-hover: $light-gray; +$pagination-item-background-current: $primary-color; +$pagination-item-color-current: $white; +$pagination-item-color-disabled: $medium-gray; +$pagination-ellipsis-color: $black; +$pagination-mobile-items: false; +$pagination-mobile-current-item: false; +$pagination-arrows: true; + +// 28. Progress Bar +// ---------------- + +$progress-height: 1rem; +$progress-background: $medium-gray; +$progress-margin-bottom: $global-margin; +$progress-meter-background: $primary-color; +$progress-radius: $global-radius; + +// 29. Prototype Arrow +// ------------------- + +$prototype-arrow-directions: ( + down, + up, + right, + left +); +$prototype-arrow-size: 0.4375rem; +$prototype-arrow-color: $black; + +// 30. Prototype Border-Box +// ------------------------ + +$prototype-border-box-breakpoints: $global-prototype-breakpoints; + +// 31. Prototype Border-None +// ------------------------- + +$prototype-border-none-breakpoints: $global-prototype-breakpoints; + +// 32. Prototype Bordered +// ---------------------- + +$prototype-bordered-breakpoints: $global-prototype-breakpoints; +$prototype-border-width: rem-calc(1); +$prototype-border-type: solid; +$prototype-border-color: $medium-gray; + +// 33. Prototype Display +// --------------------- + +$prototype-display-breakpoints: $global-prototype-breakpoints; +$prototype-display: ( + inline, + inline-block, + block, + table, + table-cell +); + +// 34. Prototype Font-Styling +// -------------------------- + +$prototype-font-breakpoints: $global-prototype-breakpoints; +$prototype-wide-letter-spacing: rem-calc(4); +$prototype-font-normal: $global-weight-normal; +$prototype-font-bold: $global-weight-bold; + +// 35. Prototype List-Style-Type +// ----------------------------- + +$prototype-list-breakpoints: $global-prototype-breakpoints; +$prototype-style-type-unordered: ( + disc, + circle, + square +); +$prototype-style-type-ordered: ( + decimal, + lower-alpha, + lower-latin, + lower-roman, + upper-alpha, + upper-latin, + upper-roman +); + +// 36. Prototype Overflow +// ---------------------- + +$prototype-overflow-breakpoints: $global-prototype-breakpoints; +$prototype-overflow: ( + visible, + hidden, + scroll +); + +// 37. Prototype Position +// ---------------------- + +$prototype-position-breakpoints: $global-prototype-breakpoints; +$prototype-position: ( + static, + relative, + absolute, + fixed +); +$prototype-position-z-index: 975; + +// 38. Prototype Rounded +// --------------------- + +$prototype-rounded-breakpoints: $global-prototype-breakpoints; +$prototype-border-radius: rem-calc(3); + +// 39. Prototype Separator +// ----------------------- + +$prototype-separator-breakpoints: $global-prototype-breakpoints; +$prototype-separator-align: center; +$prototype-separator-height: rem-calc(2); +$prototype-separator-width: 3rem; +$prototype-separator-background: $primary-color; +$prototype-separator-margin-top: $global-margin; + +// 40. Prototype Shadow +// -------------------- + +$prototype-shadow-breakpoints: $global-prototype-breakpoints; +$prototype-box-shadow: 0 2px 5px 0 rgba(0,0,0,.16), + 0 2px 10px 0 rgba(0,0,0,.12); + +// 41. Prototype Sizing +// -------------------- + +$prototype-sizing-breakpoints: $global-prototype-breakpoints; +$prototype-sizing: ( + width, + height +); +$prototype-sizes: ( + 25: 25%, + 50: 50%, + 75: 75%, + 100: 100% +); + +// 42. Prototype Spacing +// --------------------- + +$prototype-spacing-breakpoints: $global-prototype-breakpoints; +$prototype-spacers-count: 3; + +// 43. Prototype Text-Decoration +// ----------------------------- + +$prototype-decoration-breakpoints: $global-prototype-breakpoints; +$prototype-text-decoration: ( + overline, + underline, + line-through, +); + +// 44. Prototype Text-Transformation +// --------------------------------- + +$prototype-transformation-breakpoints: $global-prototype-breakpoints; +$prototype-text-transformation: ( + lowercase, + uppercase, + capitalize +); + +// 45. Prototype Text-Utilities +// ---------------------------- + +$prototype-utilities-breakpoints: $global-prototype-breakpoints; +$prototype-text-overflow: ellipsis; + +// 46. Responsive Embed +// -------------------- + +$responsive-embed-margin-bottom: rem-calc(16); +$responsive-embed-ratios: ( + default: 4 by 3, + widescreen: 16 by 9, +); + +// 47. Reveal +// ---------- + +$reveal-background: $white; +$reveal-width: 600px; +$reveal-max-width: $global-width; +$reveal-padding: $global-padding; +$reveal-border: 1px solid $medium-gray; +$reveal-radius: $global-radius; +$reveal-zindex: 1005; +$reveal-overlay-background: rgba($black, 0.45); + +// 48. Slider +// ---------- + +$slider-width-vertical: 0.5rem; +$slider-transition: all 0.2s ease-in-out; +$slider-height: 0.5rem; +$slider-background: $light-gray; +$slider-fill-background: $medium-gray; +$slider-handle-height: 1.4rem; +$slider-handle-width: 1.4rem; +$slider-handle-background: $primary-color; +$slider-opacity-disabled: 0.25; +$slider-radius: $global-radius; + +// 49. Switch +// ---------- + +$switch-background: $medium-gray; +$switch-background-active: $primary-color; +$switch-height: 2rem; +$switch-height-tiny: 1.5rem; +$switch-height-small: 1.75rem; +$switch-height-large: 2.5rem; +$switch-radius: $global-radius; +$switch-margin: $global-margin; +$switch-paddle-background: $white; +$switch-paddle-offset: 0.25rem; +$switch-paddle-radius: $global-radius; +$switch-paddle-transition: all 0.25s ease-out; + +// 50. Table +// --------- + +$table-background: $white; +$table-color-scale: 5%; +$table-border: 1px solid smart-scale($table-background, $table-color-scale); +$table-padding: rem-calc(8 10 10); +$table-hover-scale: 2%; +$table-row-hover: darken($table-background, $table-hover-scale); +$table-row-stripe-hover: darken($table-background, $table-color-scale + $table-hover-scale); +$table-is-striped: true; +$table-striped-background: smart-scale($table-background, $table-color-scale); +$table-stripe: even; +$table-head-background: smart-scale($table-background, $table-color-scale / 2); +$table-head-row-hover: darken($table-head-background, $table-hover-scale); +$table-foot-background: smart-scale($table-background, $table-color-scale); +$table-foot-row-hover: darken($table-foot-background, $table-hover-scale); +$table-head-font-color: $body-font-color; +$table-foot-font-color: $body-font-color; +$show-header-for-stacked: false; +$table-stack-breakpoint: medium; + +// 51. Tabs +// -------- + +$tab-margin: 0; +$tab-background: $white; +$tab-color: $primary-color; +$tab-background-active: $light-gray; +$tab-active-color: $primary-color; +$tab-item-font-size: rem-calc(12); +$tab-item-background-hover: $white; +$tab-item-padding: 1.25rem 1.5rem; +$tab-expand-max: 6; +$tab-content-background: $white; +$tab-content-border: $light-gray; +$tab-content-color: $body-font-color; +$tab-content-padding: 1rem; + +// 52. Thumbnail +// ------------- + +$thumbnail-border: solid 4px $white; +$thumbnail-margin-bottom: $global-margin; +$thumbnail-shadow: 0 0 0 1px rgba($black, 0.2); +$thumbnail-shadow-hover: 0 0 6px 1px rgba($primary-color, 0.5); +$thumbnail-transition: box-shadow 200ms ease-out; +$thumbnail-radius: $global-radius; + +// 53. Title Bar +// ------------- + +$titlebar-background: $black; +$titlebar-color: $white; +$titlebar-padding: 0.5rem; +$titlebar-text-font-weight: bold; +$titlebar-icon-color: $white; +$titlebar-icon-color-hover: $medium-gray; +$titlebar-icon-spacing: 0.25rem; + +// 54. Tooltip +// ----------- + +$has-tip-cursor: help; +$has-tip-font-weight: $global-weight-bold; +$has-tip-border-bottom: dotted 1px $dark-gray; +$tooltip-background-color: $black; +$tooltip-color: $white; +$tooltip-padding: 0.75rem; +$tooltip-max-width: 10rem; +$tooltip-font-size: $small-font-size; +$tooltip-pip-width: 0.75rem; +$tooltip-pip-height: $tooltip-pip-width * 0.866; +$tooltip-radius: $global-radius; + +// 55. Top Bar +// ----------- + +$topbar-padding: 0.5rem; +$topbar-background: $light-gray; +$topbar-submenu-background: $topbar-background; +$topbar-title-spacing: 0.5rem 1rem 0.5rem 0; +$topbar-input-width: 200px; +$topbar-unstack-breakpoint: medium; + +// 56. Xy Grid +// ----------- + +$xy-grid: true; +$grid-container: $global-width; +$grid-columns: 12; +$grid-margin-gutters: ( + small: 20px, + medium: 30px +); +$grid-padding-gutters: $grid-margin-gutters; +$grid-container-padding: $grid-padding-gutters; +$grid-container-max: $global-width; +$block-grid-max: 8; + diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css new file mode 100644 index 0000000000..e459ffc73b --- /dev/null +++ b/app/assets/stylesheets/application.css @@ -0,0 +1,94 @@ +/* +* This is a manifest file that'll be compiled into application.css, which will include all the files +* listed below. +* +* Any CSS and SCSS file within this directory, lib/assets/stylesheets, or any plugin's +* vendor/assets/stylesheets directory can be referenced here using a relative path. +* +* You're free to add application-wide styles to this file and they'll appear at the bottom of the +* compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS +* files in this directory. Styles in this file should be added after the last require_* statement. +* It is generally better to create a new file per style scope. +* +*= require_tree . +*= require_self +*= require foundation_and_overrides + +*/ +.flash.success { + color: green; +} +.flash.failure { + color: red; +} + +nav li { + list-style: none; + display: inline; +} + +.link-hover:hover, .link-hover:focus { + color: #fff; + background-color:#E67526; +} +#cool-splash-transparency { + background-color:rgba(0,0,0,0.5); + width:100%; + color: white; +} + +.logo-nav { + display: flex; + justify-content: space-between; + align-items: center; + padding: .5em; +} + +.inline-bl { + display: inline-block; +} + +.inline-bl span { + font-size: .5em; +} + +.dropdown { + position: relative; + display: inline-block; + /*width: 100px;*/ + padding: 3% 6%; + font-size: 20px; +} +.dropdown-content { + display: none; + position: absolute; + background-color: #f9f9f9; + min-width: 160px; + box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2); + padding: 12px 16px; + z-index: 1; + font-size: 15px; + +} + +.dropdown:hover .dropdown-content { + display: block; +} + +.align-nav { + display: inline-block; +} + +.span-align { + min-width: 160px; +} + +.column h5 { + color: white; +} + +.column p { + font-weight: bold; + color: white; + /*background-color:rgba(0,0,0,0.5);*/ +} diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss new file mode 100644 index 0000000000..302b71ae61 --- /dev/null +++ b/app/assets/stylesheets/application.scss @@ -0,0 +1,29 @@ +/* + * This is a manifest file that'll be compiled into application.css, which will include all the files + * listed below. + * + * Any CSS and SCSS file within this directory, lib/assets/stylesheets, or any plugin's + * vendor/assets/stylesheets directory can be referenced here using a relative path. + * + * You're free to add application-wide styles to this file and they'll appear at the bottom of the + * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS + * files in this directory. Styles in this file should be added after the last require_* statement. + * It is generally better to create a new file per style scope. + * + *= require_tree . + *= require_self + *= require foundation_and_overrides + + */ + .flash.success { + color: green; + } + .flash.failure { + color: red; + } + +nav li { + list-style: none; + display: inline; + color: red; +} diff --git a/app/assets/stylesheets/categories.scss b/app/assets/stylesheets/categories.scss new file mode 100644 index 0000000000..ef1657f8c9 --- /dev/null +++ b/app/assets/stylesheets/categories.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the categories 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/foundation_and_overrides.scss b/app/assets/stylesheets/foundation_and_overrides.scss new file mode 100644 index 0000000000..906dd5570a --- /dev/null +++ b/app/assets/stylesheets/foundation_and_overrides.scss @@ -0,0 +1,53 @@ +@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-card; +@include foundation-close-button; +@include foundation-drilldown-menu; +@include foundation-dropdown; +@include foundation-dropdown-menu; +@include foundation-responsive-embed; +@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/merchants.scss b/app/assets/stylesheets/merchants.scss new file mode 100644 index 0000000000..f4c164d600 --- /dev/null +++ b/app/assets/stylesheets/merchants.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Merchants 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/orders.scss b/app/assets/stylesheets/orders.scss new file mode 100644 index 0000000000..741506954d --- /dev/null +++ b/app/assets/stylesheets/orders.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Orders 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/orders_products.scss b/app/assets/stylesheets/orders_products.scss new file mode 100644 index 0000000000..25547f8fcd --- /dev/null +++ b/app/assets/stylesheets/orders_products.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Orders_Products 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/products.scss b/app/assets/stylesheets/products.scss new file mode 100644 index 0000000000..1b999cf912 --- /dev/null +++ b/app/assets/stylesheets/products.scss @@ -0,0 +1,20 @@ +// Place all the styles related to the Products controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ + +body +{ + background: url(https://i.imgur.com/UNi4pXz.jpg) no-repeat; + background-size: 100%; + background-attachment: fixed; +} +// MAIN.HTML.ERB // +.cool-prod-transparency { + background-color:rgba(192,192,192,0.2); + width:100%; + // color: white; +} + +form.quant { + width: 3em; +} diff --git a/app/assets/stylesheets/reviews.scss b/app/assets/stylesheets/reviews.scss new file mode 100644 index 0000000000..6ea2454d26 --- /dev/null +++ b/app/assets/stylesheets/reviews.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the reviews 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/sessions.scss b/app/assets/stylesheets/sessions.scss new file mode 100644 index 0000000000..7bef9cf826 --- /dev/null +++ b/app/assets/stylesheets/sessions.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the sessions controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 0000000000..d672697283 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 0000000000..0ff5442f47 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 0000000000..cdef40b607 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,31 @@ +class ApplicationController < ActionController::Base + protect_from_forgery with: :exception + before_action :require_login + + protected + def require_login + @login_user = Merchant.find_by(id: session[:merchant_id]) + unless @login_user + flash[:status] = :failure + flash[:message] = "You must be logged in to do that!" + redirect_to root_path + end + end + + def save_and_flash(model) + result = model.save + + if result + puts "Save successful" + flash[:status] = :success + flash[:message] = "Successfully created a new Satiety account for #{model.username}." # this is the message that appears when a person logs in with GitHub for the first time + else + puts "Save failed: #{model.errors.messages}" + flash.now[:status] = :failure + flash.now[:message] = "Failed to save #{model.class}." + flash.now[:details] = model.errors.messages + end + + return result + end +end diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb new file mode 100644 index 0000000000..93579f493a --- /dev/null +++ b/app/controllers/categories_controller.rb @@ -0,0 +1,77 @@ +class CategoriesController < ApplicationController + before_action :get_category, only: [:edit, :update, :destroy, :show] + skip_before_action :require_login, only: [:index, :show] + + def index + @categories = Category.all + end + + def new + @category = Category.new + end + + def create + @category = Category.new(category_params) + + if @category.save + flash[:status] = :success + flash[:message] = "Successfully created category: #{@category.id}" + redirect_to categories_path + else + flash.now[:status] = :failure + flash.now[:message] = "Failed to create category" + flash.now[:details] = @category.errors.messages + render :new, status: :bad_request + end + end + + def edit + unless @category + head :not_found + end + end + + def update + @category.update_attributes(category_params) + if @category.save + redirect_to category_path(@category) + else + render :edit, status: :bad_request + end + end + + def destroy + unless @category + head :not_found + return + end + + if @category.products.count != 0 + flash.now[:status] = :failure + flash.now[:message] = "Can't delete a category that contains products." + redirect_to categories_path, status: :bad_request + + else + @category.destroy + flash.now[:status] = :success + flash.now[:message] = "Category Deleted" + redirect_to categories_path + end + end + + def show + unless @category + head :not_found + end + end + + private + + def get_category + @category = Category.find_by(id: params[:id]) + end + + def category_params + return params.require(:category).permit(:category_name) + end +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/controllers/merchants_controller.rb b/app/controllers/merchants_controller.rb new file mode 100644 index 0000000000..38567f5061 --- /dev/null +++ b/app/controllers/merchants_controller.rb @@ -0,0 +1,65 @@ + +class MerchantsController < ApplicationController + before_action :find_merchant_by_params_id, only: [:show, :edit, :update, :destroy] + skip_before_action :require_login, only: [:index, :show] + + def index + @merchants = Merchant.all + end + + def show + @merchant = Merchant.find_by(id: params[:id]) + # make sure syntax is ok + # unless @merchant + # render: not_found + # end + end + # def new + # @merchant = Merchant.new + # end + # + # def create + # @merchant = Merchant.new(merchant_params) + # + # if save_and_flash(@merchant) + # redirect_to merchants_path + # else + # render :new, status: :bad_request + # end + # end + + + + # def edit ; end + # + # def update + # @merchant.update_attribute( merchant_params) + # + # if @merchant + # flash[:status] = :success + # flash[:message] = "Successfully saved #{@merchant.class} #{@merchant.id}" + # else + # flash.now[:status] = :failure + # flash.now[:message] = "Failed to save #{@merchant.class}" + # flash.now[:details] = @merchant.errors.messages + # end + # end + + def destroy + + end + + private + + def merchant_params + return params.require(:merchant).permit(:ususername, :email) + end + + def find_merchant_by_params_id + @merchant = Merchant.find_by(id: params[:id]) + + unless @merchant + head :not_found + end + end # end find_merchant_by_params_id +end diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb new file mode 100644 index 0000000000..9953a3e510 --- /dev/null +++ b/app/controllers/orders_controller.rb @@ -0,0 +1,76 @@ +class OrdersController < ApplicationController + skip_before_action :require_login + + def index + # placeholder for error message (empty cart) + end + + def add_to_cart + order = Order.find_or_create_cart(session[:order_id]) # find or create a cart (in order.rb) + session[:order_id] = order.id # the session's order_id will be reset to the current order.id (was either nil or existed already--"unless") + product = Product.find_by(id: params[:id]) # find the product from the URL param + + order_product = OrderProduct.new(product: product, order: order, quantity: params[:quantity]) + + order_product.quantity.times do + order.products << product + end + + # result = order.products << product # (the has_many declaration creates some cool ruby magic methods like this) + # order.save + if order.save + # order.order_products.sum(:quantity) + flash[:status] = :success + flash[:message] = "Successfully added item to cart" + else + flash.now[:status] = :failure + flash.now[:message] = "Failed to add item to cart" + flash.now[:details] = order.products.errors.messages + end + redirect_to order_path + end + + # def remove_from_cart + # # order = Order.find_or_create_cart(session[:order_id]) # find or create a cart (in order.rb) + # + # product = Product.find_by(id: params[:id]) + # arrary_orderproducts = product.order_products + # arrary_orderproducts.each do |op| + # if op.order.id == session[:order_id] + # op.destroy + # end + # end + # end + + def show + # will show order with all products listed and their quantity, + # as well as the status, + # so this info is also pulled in from the orders_products + @cart = Order.find_or_create_cart(session[:order_id]) # cart instance + end + + def billing_form + # needed to show billing form view + @billing = Billing.new + @order = Order.find_by(id:session[:order_id], status: "pending") + end + + def submit + @order = Order.find_by(id:session[:order_id], status: "pending") + + if @order.submit(billing_params) + session[:order_id] = nil # clear the session id + end + + redirect_to root_path + end + + def destroy + #updates order to cancelled, removes all associated products from OP table + end + + private + def billing_params + return params.require(:billing).permit(:street, :apt, :city, :state ,:ship_zip, :email, :credit_card, :exp, :cvv, :bill_zip, :name) + end +end diff --git a/app/controllers/orders_products_controller.rb b/app/controllers/orders_products_controller.rb new file mode 100644 index 0000000000..f6ec04274c --- /dev/null +++ b/app/controllers/orders_products_controller.rb @@ -0,0 +1,45 @@ +class OrdersProductsController < ApplicationController + def index + end + + def new + # add a product (by product_id) + #include a quantity for that product + #tie it to a sepecif order number + end + + def create + end + + def edit + #remove product IDs + end + + def update + end + + def destroy_all + #remove all products tied to a particular order number + #change status to cancelled in orders_controller + + # order = Order.find_or_create_cart(session[:order_id]) # find or create a cart (in order.rb) + # + # product = Product.find_by(id: params[:id]) + # product.order_products.destroy + + order = Order.find_or_create_cart(session[:order_id]) + order_products = OrderProduct.where(id: params[:ids].split(",")) + order_products.destroy_all + + + # array_orderproducts = product.order_products + # array_orderproducts.each do |op| + # if op.product.id == product.id + # op.destroy + # break + # end + # end + redirect_to order_path(session[:order_id]) + end + +end diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb new file mode 100644 index 0000000000..4ee4ab3d4e --- /dev/null +++ b/app/controllers/products_controller.rb @@ -0,0 +1,70 @@ +class ProductsController < ApplicationController + skip_before_action :require_login, only: [:main, :index, :show] + before_action :set_product, only: [:edit, :show, :destroy] + + def main + puts session[:order_id] + render template: "products/main" + end + + def index + @products = Product.all + end + + def new + @product = Product.new + end + + def create + @product = Product.new(product_params) + + if @product.save + flash[:status] = :success + flash[:message] = "Successfully created product: #{@product.id}" + redirect_to products_path + else + flash.now[:status] = :failure + flash.now[:message] = "Failed to create product" + flash.now[:details] = @product.errors.messages + render :new, status: :bad_request + end + end + + def show + end + + def edit + end + + def update + @product = Product.find_by(id: params[:id]) + @product.update_attributes(product_params) + + if @product.save + redirect_to product_path(@product) + else + render :edit, status: :bad_request + end + end + + def destroy + @product = Product.find(params[:id]) + @product.destroy + flash.now[:status] = :success + flash.now[:message] = "Successfully deleted product" + redirect_to root_path + end + + private + def product_params + return params.require(:product).permit(:name, :description, :price, :stock ,:category_id, :photo_URL, :merchant_id) + end + + def set_product + @product = Product.find_by(id: params[:id]) + unless @product + head :not_found + end + end + +end diff --git a/app/controllers/reviews_controller.rb b/app/controllers/reviews_controller.rb new file mode 100644 index 0000000000..ba23c07eb0 --- /dev/null +++ b/app/controllers/reviews_controller.rb @@ -0,0 +1,54 @@ +class ReviewsController < ApplicationController + skip_before_action :require_login, only: [:new, :create, :show] + before_action :set_product, only: [:new, :create, :show] + + # def index + # @reviews = @product.reviews + # end + + def new + @review = @product.reviews.build + end + + def create + #@product = Product.find(params[:product_id]) + @review = @product.reviews.build(review_params) + if @review.save + flash[:status] = :success + flash[:message] = "Thanks for the review!" + redirect_to @product + else + flash.now[:status] = :failure + flash.now[:message] = "Review failed to save" + flash.now[:details] = @review.errors.messages + render :new, status: :bad_request + end + end + + def show + @review = Review.find_by(id: params[:id]) + unless @review + head :not_found + end + end + + private + # def set_product + # @product = Product.find_by(id: params[:id]) + # unless @product + # head :not_found + # end + # end + + def set_product + @product = Product.find_by(id: params[:product_id]) + unless @product + head :not_found + end + end + + def review_params + return params.require(:review).permit(:product_id, :rating, :reviewtext) + end + +end diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb new file mode 100644 index 0000000000..22701b6589 --- /dev/null +++ b/app/controllers/sessions_controller.rb @@ -0,0 +1,35 @@ +class SessionsController < ApplicationController + skip_before_action :require_login, only: [:login] + + def login + auth_hash = request.env['omniauth.auth'] + puts "In login action, auth_hash is #{auth_hash}" + if auth_hash['uid'] + puts "Searching for merchant" + merchant = Merchant.find_by(provider: params[:provider], uid: auth_hash['uid']) + if merchant.nil? + puts "Did not find merchant, creating new one." + merchant = Merchant.from_auth_hash(params[:provider], auth_hash) + save_and_flash(merchant) # in application_controller.rb + puts "#{merchant.inspect}" + else + puts "Found merchant #{merchant.inspect}" + flash[:status] = :success + flash[:message] = "Logged in as returning user #{merchant.username}" + end + session[:merchant_id] = merchant.id + else + flash[:status] = :failure + flash[:message] = "Could not create new user." + end + redirect_to root_path + end + + def logout + session[:merchant_id] = nil + session[:order_id] = nil + flash[:status] = :success + flash[:message] = "Successfully logged out" + redirect_to root_path + end +end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb new file mode 100644 index 0000000000..de6be7945c --- /dev/null +++ b/app/helpers/application_helper.rb @@ -0,0 +1,2 @@ +module ApplicationHelper +end diff --git a/app/helpers/categories_helper.rb b/app/helpers/categories_helper.rb new file mode 100644 index 0000000000..e06f31554c --- /dev/null +++ b/app/helpers/categories_helper.rb @@ -0,0 +1,2 @@ +module CategoriesHelper +end diff --git a/app/helpers/merchants_helper.rb b/app/helpers/merchants_helper.rb new file mode 100644 index 0000000000..5337747b0f --- /dev/null +++ b/app/helpers/merchants_helper.rb @@ -0,0 +1,2 @@ +module MerchantsHelper +end diff --git a/app/helpers/orders_helper.rb b/app/helpers/orders_helper.rb new file mode 100644 index 0000000000..443227fd48 --- /dev/null +++ b/app/helpers/orders_helper.rb @@ -0,0 +1,2 @@ +module OrdersHelper +end diff --git a/app/helpers/orders_products_helper.rb b/app/helpers/orders_products_helper.rb new file mode 100644 index 0000000000..159322c253 --- /dev/null +++ b/app/helpers/orders_products_helper.rb @@ -0,0 +1,2 @@ +module OrdersProductsHelper +end diff --git a/app/helpers/products_helper.rb b/app/helpers/products_helper.rb new file mode 100644 index 0000000000..ab5c42b325 --- /dev/null +++ b/app/helpers/products_helper.rb @@ -0,0 +1,2 @@ +module ProductsHelper +end diff --git a/app/helpers/reviews_helper.rb b/app/helpers/reviews_helper.rb new file mode 100644 index 0000000000..682b7b1abc --- /dev/null +++ b/app/helpers/reviews_helper.rb @@ -0,0 +1,2 @@ +module ReviewsHelper +end diff --git a/app/helpers/sessions_helper.rb b/app/helpers/sessions_helper.rb new file mode 100644 index 0000000000..309f8b2eb3 --- /dev/null +++ b/app/helpers/sessions_helper.rb @@ -0,0 +1,2 @@ +module SessionsHelper +end diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 0000000000..a009ace51c --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 0000000000..286b2239d1 --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 0000000000..10a4cba84d --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/billing.rb b/app/models/billing.rb new file mode 100644 index 0000000000..921c1c363d --- /dev/null +++ b/app/models/billing.rb @@ -0,0 +1,8 @@ +class Billing < ApplicationRecord + validates :name, :street, :city, :state, :email, :cvv, presence: true + validates :ship_zip, :bill_zip, presence: true, length: { is: 5} + validates :credit_card, presence: true, length: { is: 16 } + # all these things are required + # apt is optional + +end diff --git a/app/models/category.rb b/app/models/category.rb new file mode 100644 index 0000000000..f68bd3a738 --- /dev/null +++ b/app/models/category.rb @@ -0,0 +1,8 @@ +class Category < ApplicationRecord + # validates :category_name, uniqueness: true, + + has_many :products + + validates :category_name, presence: true, uniqueness: true, length: { maximum: 30, too_long: "Name must be shorter than 30 characters." } + # must have category_name, must be unique +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/models/merchant.rb b/app/models/merchant.rb new file mode 100644 index 0000000000..be5fe88887 --- /dev/null +++ b/app/models/merchant.rb @@ -0,0 +1,20 @@ +class Merchant < ApplicationRecord + has_many :products, dependent: :destroy + + has_many :order_products, through: :products + has_many :orders, through: :order_products + + validates :username, presence: true, uniqueness: true + validates :email, presence: true, uniqueness: true + # provider and uid are validated in the migration + + def self.from_auth_hash(provider, auth_hash) + merchant = new + merchant.provider = provider + merchant.uid = auth_hash['uid'] + merchant.username = auth_hash['info']['name'] || auth_hash['info']['nickname'] + merchant.email = auth_hash['info']['email'] + + return merchant + end +end diff --git a/app/models/order.rb b/app/models/order.rb new file mode 100644 index 0000000000..c6a7b40704 --- /dev/null +++ b/app/models/order.rb @@ -0,0 +1,86 @@ +class Order < ApplicationRecord + has_many :order_products + has_many :products, through: :order_products + has_many :merchants, through: :products + + # class methods instead of instance methods (like in ctrl) + # self.start_new_order is a class method + def self.start_new_order + order = Order.new + order.status = "pending" + order.save + return order + end + + def remove_from_cart + order = Order.find_or_create_cart(session[:order_id]) # find or create a cart (in order.rb) + + end + + def submit(billing_params) + billing = Billing.new(billing_params) + if billing.save + self.status = "paid" + unless self.subtract_products # if you can't subract products, we know it fails + return false + end + self.products.clear + self.save # officially changes status to "paid" + return true + end + # something.transaction + # 2. status change from pending to paid + # 1. subtract_products + # 3. clear cart + return false + end + + # def pending_to_paid + # self.status = "paid" + # end + # + # def clear_cart + # + # end + + def get_quantities + items = {} # keys are the product, values are the quantity + + self.products.each do |product| + + if items.include?(product) + items[product] += 1 # if the current product is in the cart, add 1 to its value + else + items[product] = 1 # if the current product is not in the cart, set its initial value to 1 + end + end + return items # hash of all items in the cart, k = product, v = quantity + end + + # subtract_products is an instance method + # self inside this method is calling `self` on an instance of order + def subtract_products + Order.transaction do + self.get_quantities.each do |product, quantity| + product.stock -= quantity # reduce from STOCK + product.save + end + end + return true + rescue StandardError => e # something failed when updating the database + puts e.message + puts e.backtrace.inspect + return false # explicitly returning false instead of an exception + end + + # order_id being passed in is session[:order_id] from order ctrl, cannot use sessions in model methods + ## this method can be used with any other parameter passed in, this is just the current use! + def self.find_or_create_cart(order_id) + order = Order.find_by(id: order_id, status: "pending") # rails won't blow up if the session id is nil, turns out + # checking if the order has BOTH the same order_id and status "pending" + unless order + order = start_new_order # if no matching orders, start a new order + end + return order + end +end diff --git a/app/models/order_product.rb b/app/models/order_product.rb new file mode 100644 index 0000000000..156810e9a1 --- /dev/null +++ b/app/models/order_product.rb @@ -0,0 +1,5 @@ +class OrderProduct < ApplicationRecord + belongs_to :product + belongs_to :order + +end diff --git a/app/models/product.rb b/app/models/product.rb new file mode 100644 index 0000000000..07b5e7ec13 --- /dev/null +++ b/app/models/product.rb @@ -0,0 +1,27 @@ +class Product < ApplicationRecord + # TODO: add this back after demo + # belongs_to :merchant + belongs_to :category + has_many :order_products + has_many :orders, through: :order_products + has_many :reviews, dependent: :destroy + + + validates :name, presence: true + validates :price, presence: true, numericality: { + greater_than: 0 + } + validates :stock, presence: true, numericality: { + greater_than_or_equal_to: 0, + only_integer: true + } + # TODO: add this back after demo + # validates :merchant_id, presence: true + validates :category_id, presence: true + + def average_rating + reviews.average(:rating) + end + # validates_associated :merchant, :category + +end diff --git a/app/models/review.rb b/app/models/review.rb new file mode 100644 index 0000000000..87314f1a4f --- /dev/null +++ b/app/models/review.rb @@ -0,0 +1,7 @@ +class Review < ApplicationRecord + belongs_to :product + + validates :rating, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 1, less_than_or_equal_to: 5 } + + validates :reviewtext, length: { maximum: 500, too_long: "Review must be under 500 characters." } +end diff --git a/app/views/categories/edit.html.erb b/app/views/categories/edit.html.erb new file mode 100644 index 0000000000..9df4f5a847 --- /dev/null +++ b/app/views/categories/edit.html.erb @@ -0,0 +1,9 @@ +

This is the page to edit categories

+ +<%= form_for @category do |f| %> + <%= f.label "Category Name" %> + <%= f.text_field :category_name %> + + <%= f.submit "Create Category", :class=>"button" %> + +<% end %> diff --git a/app/views/categories/index.html.erb b/app/views/categories/index.html.erb new file mode 100644 index 0000000000..4c552ef303 --- /dev/null +++ b/app/views/categories/index.html.erb @@ -0,0 +1,39 @@ + + +

Browse our Categories

+ + + + + + + + <%= link_to "Add Category", new_category_path, :class=>"button" %> + + + + + + + <% @categories.each do |category| %> + + + + + <% end %> + +
+ Category + + Edit Category + + Delete Category +
+ <%= link_to category.category_name, category %> + + <%= link_to "Edit Category", edit_category_path(category.id), :class=>"button" %> + + <%= link_to "Delete Category", category_path(category), method: :delete, :class=>"button" %> +
diff --git a/app/views/categories/new.html.erb b/app/views/categories/new.html.erb new file mode 100644 index 0000000000..6b13e1979b --- /dev/null +++ b/app/views/categories/new.html.erb @@ -0,0 +1,16 @@ +

Add new Category

+ +<%#= render partial: 'layouts/error_messages', + locals: { model: @work } %> +

Category Name Limit: 30 Characters

+ + + + +<%= form_for @category do |f| %> + <%= f.label "Category Name" %> + <%= f.text_field :category_name %> + + <%= f.submit "Create Category", :class=>"button" %> + +<% end %> diff --git a/app/views/categories/show.html.erb b/app/views/categories/show.html.erb new file mode 100644 index 0000000000..2ae0cfeee0 --- /dev/null +++ b/app/views/categories/show.html.erb @@ -0,0 +1,52 @@ +

<%#= @category.category_name %>

+ + + + + + + + + + + + + + <% category_products = @category.products %> + + <% category_products.each do |product| %> + + + + + + + + <% end %> + +
+ Name + + Description + + Price + + Number in Stock + + Add to Cart +
+ <%= link_to product.name, product_path(product.id) %> + + <%= product.description %> + + <%= product.price %> + + <%= product.stock %> + + <%#= link_to "Direct Link to Purchase?", "#" %> + <%= link_to "Add to cart", add_to_cart_path(product.id), :class=>"button", method: :post %> +
diff --git a/app/views/layouts/_message.html.erb b/app/views/layouts/_message.html.erb new file mode 100644 index 0000000000..faeffd2c17 --- /dev/null +++ b/app/views/layouts/_message.html.erb @@ -0,0 +1,13 @@ + +
+

<%= flash[:message] %>

+ <% if flash[:details] %> + + <% end %> +
diff --git a/app/views/layouts/_nav.html.erb b/app/views/layouts/_nav.html.erb new file mode 100644 index 0000000000..cdcba40596 --- /dev/null +++ b/app/views/layouts/_nav.html.erb @@ -0,0 +1,48 @@ + +
+ + + +
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb new file mode 100644 index 0000000000..b4a105b2b4 --- /dev/null +++ b/app/views/layouts/application.html.erb @@ -0,0 +1,86 @@ + + + + Satiety + <%= csrf_meta_tags %> + + <%#= stylesheet_link_tag 'application', 'google font' %> + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> + <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + +
+
+ +
+

<%=link_to "Satiety", root_path %> Home-Cooked Meals on Demand

+
+ +
+ + + + + +
+ + +
+
+ + + +
+ <%= render partial: 'layouts/message' %> +
+ + <%= yield %> + + + + + + diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 0000000000..cbd34d2e9d --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 0000000000..37f0bddbd7 --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/app/views/merchants/edit.html.erb b/app/views/merchants/edit.html.erb new file mode 100644 index 0000000000..813bb10251 --- /dev/null +++ b/app/views/merchants/edit.html.erb @@ -0,0 +1 @@ +

Edit Merchant

diff --git a/app/views/merchants/index.html.erb b/app/views/merchants/index.html.erb new file mode 100644 index 0000000000..e631a4467f --- /dev/null +++ b/app/views/merchants/index.html.erb @@ -0,0 +1,16 @@ +

Merchants

+ + + + + + <% @merchants.each do |merchant| %> + + + + <% end %> +
+ Name +
+ <%= merchant.username %> +
diff --git a/app/views/merchants/new.html.erb b/app/views/merchants/new.html.erb new file mode 100644 index 0000000000..1e864533b7 --- /dev/null +++ b/app/views/merchants/new.html.erb @@ -0,0 +1 @@ +

Merchant#new

diff --git a/app/views/merchants/show.html.erb b/app/views/merchants/show.html.erb new file mode 100644 index 0000000000..1ca839e240 --- /dev/null +++ b/app/views/merchants/show.html.erb @@ -0,0 +1,53 @@ +

<%= @merchant.username %>

+ +<%= link_to "Create New Category", new_category_path %> + + + + + + + + + + + + + <% merchant_products = @merchant.products %> + + <% merchant_products.each do |product| %> + + + + + + + + <% end %> + +
+ Name + + Description + + Price + + Number in Stock + + Category + + Add to Cart +
+ <%= link_to product.name, product_path(product.id) %> + + <%= product.description %> + + <%= product.price %> + + <%= product.stock %> + + <%= link_to product.category.category_name, category_path(product.category.id) %> + + <%#= link_to "Direct Link to Purchase?", "#" %> + <%= link_to "Add to cart", add_to_cart_path(product.id), :class=>"button", method: :post %> +
diff --git a/app/views/orders/billing_form.html.erb b/app/views/orders/billing_form.html.erb new file mode 100644 index 0000000000..a5e90a239e --- /dev/null +++ b/app/views/orders/billing_form.html.erb @@ -0,0 +1,42 @@ +

Billing Info

+ + +<%# hard coded order id%> +<%# TODO: uodate order id that is passed into show_order_path %> +<%= form_for @billing, url: complete_order_path do |f| %> + <%= f.label "Name" %> + <%= f.text_field :name %> + + <%= f.label "Street" %> + <%= f.text_field :street %> + + <%= f.label "Apt" %> + <%= f.text_field :apt %> + + <%= f.label "City" %> + <%= f.text_field :city %> + + <%= f.label "State" %> + <%= f.text_field :state %> + + <%= f.label "Billing Zip Code" %> + <%= f.text_field :bill_zip %> + + <%= f.label "Shipping Zip Code" %> + <%= f.text_field :ship_zip %> + + <%= f.label "Email" %> + <%= f.text_field :email %> + + <%= f.label "Credit card number" %> + <%= f.text_field :credit_card %> + + <%= f.label "Expiration date" %> + <%= f.text_field :exp %> + + <%= f.label "CVV" %> + <%= f.text_field :cvv %> + + <%= f.submit "Submit", :class=>"button" %> + +<% end %> diff --git a/app/views/orders/index.html.erb b/app/views/orders/index.html.erb new file mode 100644 index 0000000000..1bc4586dd8 --- /dev/null +++ b/app/views/orders/index.html.erb @@ -0,0 +1,3 @@ +Gotta put some items in your cart! + + diff --git a/app/views/orders/show.html.erb b/app/views/orders/show.html.erb new file mode 100644 index 0000000000..64ee2fcc0e --- /dev/null +++ b/app/views/orders/show.html.erb @@ -0,0 +1,14 @@ +<%# will almost never *actually* use the through-table because rails will provide the tools for you--exists to connect the two tables only %> +<% if @cart.products.any? %> <%# @cart.products = nice method rails gives us because it knows the relationship (a cart has many products) is there %> + <% @cart.get_quantities.each do |product, quantity| %> +

<%= link_to product.name, product_path(product.id) %>

+

Unit Price: <%= product.price %>

+

quantity: <%= quantity %> + +

<%= link_to "Remove Product", destroy_all_path(ids: @cart.order_products.where(product_id: product.id).pluck(:id).join(",")), method: :delete, class: "button" %>

+ <% end %> + +

<%= link_to "Checkout", billing_form_path, class: "button" %>

+ <% else %> +

Your shopping cart is empty.

<%# need to figure this out--currently, the index view is a work-around %> +<% end %> diff --git a/app/views/orders/show_order.html.erb b/app/views/orders/show_order.html.erb new file mode 100644 index 0000000000..c936b29ee9 --- /dev/null +++ b/app/views/orders/show_order.html.erb @@ -0,0 +1 @@ +

Your order<%= @order.id%> details

diff --git a/app/views/products/_form.html.erb b/app/views/products/_form.html.erb new file mode 100644 index 0000000000..b3fd6c14bd --- /dev/null +++ b/app/views/products/_form.html.erb @@ -0,0 +1,23 @@ +<%= form_for @product do |f| %> + + <%= f.label "Name" %> + <%= f.text_field :name %> + + <%= f.label :category %> + <%= f.collection_select(:category_id, Category.all, :id, :category_name) %> + + <%= f.label "Description" %> + <%= f.text_field :description %> + + <%= f.label "Price" %> + <%= f.text_field :price %> + + <%= f.label "Number in Stock" %> + <%= f.text_field :stock %> + + <%= f.label "Photo URL" %> + <%= f.url_field :photo_URL %> + + <%= f.submit button_text, :class=>"button" %> + + <% end %> diff --git a/app/views/products/edit.html.erb b/app/views/products/edit.html.erb new file mode 100644 index 0000000000..e5097e2af0 --- /dev/null +++ b/app/views/products/edit.html.erb @@ -0,0 +1,6 @@ +

Edit product

+ +<%#= render partial: 'layouts/error_messages', + locals: { model: @work } %> + <%= render partial: 'form', + locals: { hide_placeholder_text: false, button_text: "Update Product", :class=>"button"}%> diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb new file mode 100644 index 0000000000..723d6eb214 --- /dev/null +++ b/app/views/products/index.html.erb @@ -0,0 +1,50 @@ +

Products

+ +<%= link_to "Add Product", new_product_path, :class=>"button" %> + + + + + + + + + + + + + <% @products.each do |product| %> + + + + + + + + <% end %> + +
+ Name + + Description + + Price + + Number in Stock + + Category + + Review +
+ <%= link_to product.name, product_path(product.id) %> + + <%= product.description %> + + <%= product.price %> + + <%= product.stock %> + + <%= product.category.category_name %> + + <%= link_to "Review", new_product_review_path(product.id) %> +
diff --git a/app/views/products/main.html.erb b/app/views/products/main.html.erb new file mode 100644 index 0000000000..0a2d07f3c9 --- /dev/null +++ b/app/views/products/main.html.erb @@ -0,0 +1,27 @@ +
+
+
+
Brioche
+ +

Price: $5

+ Buy +
+
+
Red Chilaquiles & Fried Eggs
+ +

Price: $10

+ Buy +
+
+
Pan Fried Tofu
+ +

Price: $10

+ Buy +
+
+
Bubble tea
+ +

Price: $5

+ Buy +
+
diff --git a/app/views/products/new.html.erb b/app/views/products/new.html.erb new file mode 100644 index 0000000000..f6dd78b537 --- /dev/null +++ b/app/views/products/new.html.erb @@ -0,0 +1,6 @@ +

Add new product

+ +<%#= render partial: 'layouts/error_messages', + locals: { model: @work } %> +<%= render partial: 'form', + locals: { button_text: "Add Product", :class=>"button"} %> diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb new file mode 100644 index 0000000000..c96a3e5fce --- /dev/null +++ b/app/views/products/show.html.erb @@ -0,0 +1,64 @@ +
+
+

<%= @product.name %><%# sold by who? %> + <% if session[:merchant_id] %> + <%= link_to "Edit", edit_product_path %> + <% end %> | + <% if session[:merchant_id] %> + <%= link_to "Delete", product_path(@product), method: :delete %> + <% end %> +

+

<%= @product.description %>
+ Only: $<%= @product.price %>.00

+ + Available: <%= @product.stock %>

+
+
+ <% if @product.stock == 0 %> +
+
+
+
+ +
+
+ +
+

Reviews

+

Average Rating: + + <% if @product.average_rating == nil %> + 0 + <% else %> + <%= @product.average_rating.round(2) %> + <% end %> / 5 Hearts

+
+
+ <% reviews = @product.reviews.to_a %> + + <% reviews.each do |review| %> +
<%= review.rating %> Hearts Warmed + on <%= review.created_at.strftime("%B %d, %Y") %>
+

<%= review.reviewtext %>

+ <% end %> +
+
+
+
+ + diff --git a/app/views/reviews/index.html.erb b/app/views/reviews/index.html.erb new file mode 100644 index 0000000000..50ad0fdb6a --- /dev/null +++ b/app/views/reviews/index.html.erb @@ -0,0 +1,66 @@ +

This is some stuff that wasn't working so I'm saving it here.

+ + + + + + + +<%= form_for @product do |f| %> + <%= f.label "Name" %> + <%= f.text_field :name %> + + <%= f.label "Description" %> + <%= f.text_field :description %> + + <%= f.label "Price" %> + <%= f.text_field :price %> + + <%= f.label "Publication_year" %> + <%= f.text_field :stock %> + + <%= f.label "Category_id" %> + <%= f.text_field :category_id %> + + <%= f.label "Photo_URL" %> + <%= f.text_field :photo_URL %> + + <%= f.submit "Update product", :class=>"button" %> + +<% end %> + <#% end %> +<#% if @product.category_id %> + <#%= f.hidden_field :category_id %> +<#% else %> + +name,description,price,stock,category_id,photo_URL,merchant_id +Ginger Beer,Bubbly Bits of Ginger,10,10,6,https://static.pexels.com/photos/418225/pexels-photo-418225.jpeg,2 +Bubble Tea,Tea but with Bubbles,3,100,6,https://prods3.imgix.net/images/articles/2017_06/non-feature-bubble-tea-bad-health.jpg,5 +Lemonade,When Life Gives You Lemons,5,5,6,http://www.freefoodphotos.com/imagelibrary/drink/slides/lemonade_glasses.jpg,3 +Fruit Smoothie,This Smoothie Brings all the Vitamins to the Yard,7,4,6,http://www.freefoodphotos.com/imagelibrary/drink/slides/milkshake.jpg,7 +Shakshuka,Tomato and Egg Delight,10,10,2,https://images.food52.com/XriDgBBMyPKkfhmcNBNOfFrHMEY=/753x502/b51df01a-73a1-46df-b311-31fd6111d761--2014-0819_shakshuka-003.jpg,2 +Red Chilaquiles with Fried Eggs,Cheese and Eggs and Sauce Oh My!,17,10,6,https://images.food52.com/rzgZ01EXRiJd1szmmQTaws1UG-4=/753x502/f87d6799-35b8-4d96-a7c5-c624e1f70938--2015_0112_quick-red-chilaquiles-5651.jpg,2 +Brioche,Fancy Pastries to Start Your Day,3 Right,2,12,2,https://images.food52.com/Rt1n7F7N5qpmMofeWadqMJPHtC4=/753x502/12bcfa24-59e6-4b49-9aa2-6b0a31ab8830--brioche_yossy_arefi-15.jpg,1 +Pancakes,Flat and Syrupy,12,5,2,Pancakes_URL,2 +Pork Roll Breakfast Sandwich,New Jersey's Finest,5,10,2,http://myjerseyshorelife.com/wp-content/uploads/2016/08/13654367_621255891372198_576486027620737011_n-1.jpg,4 +Sinangag,Garlic Fried Rice with Vinegar Sauce,15,6,2,https://www.saveur.com/g00/3_c-6bbb.x78fajzw.htr_/c-6RTWJUMJZX77x24myyux78x3ax2fx2fbbb.x78fajzw.htrx2fx78nyjx78x2fx78fajzw.htrx2fknqjx78x2fx78ydqjx78x2f100_6c_x2fuzgqnhx2fnrutwyx2f7569x2f7569-65x2fwjhnuj_x78nsfslfl-knqnunst-lfwqnh-kwnji-wnhj_355c6755.oulx3fnytpx3daEz_3YTx78x26n65h.rfwp.nrflj.yduj_$/$/$/$/$/$/$/$/$/$/$,5 +Baked Ziti,Hometown Favorite,15,10,4,Ziti_URL,1 +Pad Thai,Noodle Delight,12,23,6,Noodle_URL,3 +Apple Pie,Flaky Crust,15,12,5,Pie_URL,3 +Lumpia,Not just Lumps,5,15,6,Lumpia_URL,2 +Cheesy Crackers,Like Crackers and Cheese,5,5,2,CheesyCrackersURL,1 +Tacos,Good Even on Wednesdays,12,12,3,Tacos_URL,3 diff --git a/app/views/reviews/new.html.erb b/app/views/reviews/new.html.erb new file mode 100644 index 0000000000..84d29af638 --- /dev/null +++ b/app/views/reviews/new.html.erb @@ -0,0 +1,14 @@ + +

Reviewing: <%= @product.name%>

+ +<%= form_for [@product,@review] do |f| %> + <%= f.label "Rating: Five is Best!" %> + + <%= f.select :rating, [5, 4, 3, 2, 1] %> + + <%= f.label "Review: Limit 500 Characters" %> + <%= f.text_field :reviewtext %> + + <%= f.submit "Submit Review", class: "button" %> + +<% end %> diff --git a/app/views/sessions/login.html.erb b/app/views/sessions/login.html.erb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 0000000000..66e9889e8b --- /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 0000000000..5badb2fde0 --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 0000000000..d87d5f5781 --- /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 0000000000..78c4e861dc --- /dev/null +++ b/bin/setup @@ -0,0 +1,38 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # Install JavaScript dependencies if using Yarn + # system('bin/yarn') + + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:setup' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 0000000000..fb2ec2ebb4 --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == "spring" } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/bin/update b/bin/update new file mode 100755 index 0000000000..a8e4462f20 --- /dev/null +++ b/bin/update @@ -0,0 +1,29 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/yarn b/bin/yarn new file mode 100755 index 0000000000..c2bacef836 --- /dev/null +++ b/bin/yarn @@ -0,0 +1,11 @@ +#!/usr/bin/env ruby +VENDOR_PATH = File.expand_path('..', __dir__) +Dir.chdir(VENDOR_PATH) do + begin + exec "yarnpkg #{ARGV.join(" ")}" + rescue Errno::ENOENT + $stderr.puts "Yarn executable was not detected in the system." + $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install" + exit 1 + end +end diff --git a/config.ru b/config.ru new file mode 100644 index 0000000000..f7ba0b527b --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 0000000000..5f6ca0f9b2 --- /dev/null +++ b/config/application.rb @@ -0,0 +1,25 @@ +require_relative 'boot' + +require 'rails/all' + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module Betsy + class Application < Rails::Application + config.generators do |g| + # Force new test files to be generated in the minitest-spec style + g.test_framework :minitest, spec: true + + # Always use .js files, never .coffee + g.javascript_engine :js + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 5.1 + + # 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. + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 0000000000..30f5120df6 --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,3 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 0000000000..3cba994bb2 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: redis://localhost:6379/1 + channel_prefix: betsy_production diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 0000000000..6903bb6083 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: betsy_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: betsy + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: betsy_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: betsy_production + username: betsy + password: <%= ENV['BETSY_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 0000000000..426333bb46 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 0000000000..5187e22186 --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,54 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + if Rails.root.join('tmp/caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.seconds.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Debug mode disables concatenation and preprocessing of assets. + # This option may cause significant delays in view rendering with a large + # number of complex assets. + config.assets.debug = true + + # Suppress logger output for asset requests. + config.assets.quiet = true + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 0000000000..9284f84839 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,91 @@ +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 + + # Attempt to read encrypted secrets from `config/secrets.yml.enc`. + # Requires an encryption key in `ENV["RAILS_MASTER_KEY"]` or + # `config/secrets.yml.key`. + config.read_encrypted_secrets = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Compress JavaScripts and CSS. + config.assets.js_compressor = :uglifier + # config.assets.css_compressor = :sass + + # Do not fallback to assets pipeline if a precompiled asset is missed. + config.assets.compile = false + + # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "betsy_#{Rails.env}" + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 0000000000..8e5cbde533 --- /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 public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.seconds.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 0000000000..89d2efab2b --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb new file mode 100644 index 0000000000..4b828e80cb --- /dev/null +++ b/config/initializers/assets.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# Version of your assets, change this if you want to expire all your assets. +Rails.application.config.assets.version = '1.0' + +# Add additional assets to the asset load path. +# Rails.application.config.assets.paths << Emoji.images_path +# Add Yarn node_modules folder to the asset load path. +Rails.application.config.assets.paths << Rails.root.join('node_modules') + +# Precompile additional assets. +# application.js, application.css, and all non-JS/CSS in the app/assets +# folder are already added. +# Rails.application.config.assets.precompile += %w( admin.js admin.css ) diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 0000000000..59385cdf37 --- /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 0000000000..5a6a32d371 --- /dev/null +++ b/config/initializers/cookies_serializer.rb @@ -0,0 +1,5 @@ +# Be sure to restart your server when you modify this file. + +# Specify a serializer for the signed and encrypted cookie jars. +# Valid options are :json, :marshal, and :hybrid. +Rails.application.config.action_dispatch.cookies_serializer = :json diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 0000000000..4a994e1e7b --- /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 0000000000..ac033bf9dc --- /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 0000000000..dc1899682b --- /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/omniauth.rb b/config/initializers/omniauth.rb new file mode 100644 index 0000000000..fd4416122a --- /dev/null +++ b/config/initializers/omniauth.rb @@ -0,0 +1,3 @@ +Rails.application.config.middleware.use OmniAuth::Builder do + provider :github, ENV["GITHUB_CLIENT_ID"], ENV["GITHUB_CLIENT_SECRET"], scope: "user:email" +end diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 0000000000..bbfc3961bf --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 0000000000..decc5a8573 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 0000000000..1e19380dcb --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,56 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. If you use this option +# you need to make sure to reconnect any threads in the `on_worker_boot` +# block. +# +# preload_app! + +# If you are preloading your application and using Active Record, it's +# recommended that you close any connections to the database before workers +# are forked to prevent connection leakage. +# +# before_fork do +# ActiveRecord::Base.connection_pool.disconnect! if defined?(ActiveRecord) +# end + +# The code in the `on_worker_boot` will be called if you are using +# clustered mode by specifying a number of `workers`. After each worker +# process is booted, this block will be run. If you are using the `preload_app!` +# option, you will want to use this block to reconnect to any threads +# or connections that may have been created at application boot, as Ruby +# cannot share connections between processes. +# +# on_worker_boot do +# ActiveRecord::Base.establish_connection if defined?(ActiveRecord) +# end +# + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 0000000000..4e681dde07 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,23 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + root 'products#main' + + # resources :review, except: [:index, :new] + + resources :products do + resources :reviews, only: [:index, :new, :create] + end + + resources :merchants + resources :categories + resources :orders + resources :orders_products + + delete '/orders_products/', to: 'orders_products#destroy_all', as: 'destroy_all' + + get '/auth/:provider/callback', to: 'sessions#login', as: 'auth_callback' + post '/logout', to: 'sessions#logout', as: 'logout' + post '/add_to_cart/:id', to: 'orders#add_to_cart', as: 'add_to_cart' + get '/billing_form', to: 'orders#billing_form' + post '/order/complete', to: 'orders#submit', as: 'complete_order' +end diff --git a/config/secrets.yml b/config/secrets.yml new file mode 100644 index 0000000000..4dbcb51507 --- /dev/null +++ b/config/secrets.yml @@ -0,0 +1,32 @@ +# 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 `rails secret` to generate a secure secret key. + +# Make sure the secrets in this file are kept private +# if you're sharing your code publicly. + +# Shared secrets are available across all environments. + +# shared: +# api_key: a1B2c3D4e5F6 + +# Environmental secrets are only available for that specific environment. + +development: + secret_key_base: bec057bb552829dbb276d4fc62d07f866cf4fae50fa58f3179b821d584b0de4426049f372418840189f0645ce3213c1d1aab5b06ccae99c0a3802ae5e44706be + +test: + secret_key_base: 2453cc316f77e3b903d67935dfc0343a5f3b9ab84fea1a98305bba0d5d2341f869691c5a7e378e5955750ae4e3c5947bb23ee3d4ae54e98b5eff1352e4e577aa + +# Do not keep production secrets in the unencrypted secrets file. +# Instead, either read values from the environment. +# Or, use `bin/rails secrets:setup` to configure encrypted secrets +# and move the `production:` environment over there. + +production: + secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 0000000000..c9119b40c0 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w( + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +).each { |path| Spring.watch(path) } diff --git a/db/migrate/20171018000506_create_merchants.rb b/db/migrate/20171018000506_create_merchants.rb new file mode 100644 index 0000000000..64a57c904c --- /dev/null +++ b/db/migrate/20171018000506_create_merchants.rb @@ -0,0 +1,10 @@ +class CreateMerchants < ActiveRecord::Migration[5.1] + def change + create_table :merchants do |t| + t.string :username + t.string :email + + t.timestamps + end + end +end diff --git a/db/migrate/20171018044553_create_products.rb b/db/migrate/20171018044553_create_products.rb new file mode 100644 index 0000000000..969fae5730 --- /dev/null +++ b/db/migrate/20171018044553_create_products.rb @@ -0,0 +1,13 @@ +class CreateProducts < ActiveRecord::Migration[5.1] + def change + create_table :products do |t| + t.string :name + t.string :description + t.integer :price + t.integer :stock + t.integer :category_id + + t.timestamps + end + end +end diff --git a/db/migrate/20171018174651_add_photo_url_to_products.rb b/db/migrate/20171018174651_add_photo_url_to_products.rb new file mode 100644 index 0000000000..e6250547be --- /dev/null +++ b/db/migrate/20171018174651_add_photo_url_to_products.rb @@ -0,0 +1,5 @@ +class AddPhotoUrlToProducts < ActiveRecord::Migration[5.1] + def change + add_column :products, :photo_URL, :string + end +end diff --git a/db/migrate/20171018183715_add_merchant_id_to_products.rb b/db/migrate/20171018183715_add_merchant_id_to_products.rb new file mode 100644 index 0000000000..0e8db5b3d9 --- /dev/null +++ b/db/migrate/20171018183715_add_merchant_id_to_products.rb @@ -0,0 +1,5 @@ +class AddMerchantIdToProducts < ActiveRecord::Migration[5.1] + def change + add_column :products, :merchant_id, :integer + end +end diff --git a/db/migrate/20171018214616_create_categories.rb b/db/migrate/20171018214616_create_categories.rb new file mode 100644 index 0000000000..6e136ce0ec --- /dev/null +++ b/db/migrate/20171018214616_create_categories.rb @@ -0,0 +1,9 @@ +class CreateCategories < ActiveRecord::Migration[5.1] + def change + create_table :categories do |t| + t.string :category_name + + t.timestamps + end + end +end diff --git a/db/migrate/20171019164834_create_order_products.rb b/db/migrate/20171019164834_create_order_products.rb new file mode 100644 index 0000000000..dd0afe94f7 --- /dev/null +++ b/db/migrate/20171019164834_create_order_products.rb @@ -0,0 +1,11 @@ +class CreateOrderProducts < ActiveRecord::Migration[5.1] + def change + create_table :order_products do |t| + t.integer :quanitity + t.integer :product_id + t.integer :order_id + + t.timestamps + end + end +end diff --git a/db/migrate/20171019171402_create_orders.rb b/db/migrate/20171019171402_create_orders.rb new file mode 100644 index 0000000000..8d3698575f --- /dev/null +++ b/db/migrate/20171019171402_create_orders.rb @@ -0,0 +1,9 @@ +class CreateOrders < ActiveRecord::Migration[5.1] + def change + create_table :orders do |t| + t.string :status + + t.timestamps + end + end +end diff --git a/db/migrate/20171019220543_add_uid_and_provider_to_merchants.rb b/db/migrate/20171019220543_add_uid_and_provider_to_merchants.rb new file mode 100644 index 0000000000..9d8699705d --- /dev/null +++ b/db/migrate/20171019220543_add_uid_and_provider_to_merchants.rb @@ -0,0 +1,6 @@ +class AddUidAndProviderToMerchants < ActiveRecord::Migration[5.1] + def change + add_column :merchants, :provider, :string, null: false + add_column :merchants, :uid, :string, null: false + end +end diff --git a/db/migrate/20171020000956_create_reviews.rb b/db/migrate/20171020000956_create_reviews.rb new file mode 100644 index 0000000000..a5f0a7f677 --- /dev/null +++ b/db/migrate/20171020000956_create_reviews.rb @@ -0,0 +1,11 @@ +class CreateReviews < ActiveRecord::Migration[5.1] + def change + create_table :reviews do |t| + t.integer :product_id + t.integer :rating + t.string :reviewtext + + t.timestamps + end + end +end diff --git a/db/migrate/20171020190246_add_user_id_to_order.rb b/db/migrate/20171020190246_add_user_id_to_order.rb new file mode 100644 index 0000000000..346aa3f7e9 --- /dev/null +++ b/db/migrate/20171020190246_add_user_id_to_order.rb @@ -0,0 +1,5 @@ +class AddUserIdToOrder < ActiveRecord::Migration[5.1] + def change + add_column :orders, :user_id, :integer + end +end diff --git a/db/migrate/20171020203041_add_order_id_to_orders.rb b/db/migrate/20171020203041_add_order_id_to_orders.rb new file mode 100644 index 0000000000..360e3b13a2 --- /dev/null +++ b/db/migrate/20171020203041_add_order_id_to_orders.rb @@ -0,0 +1,5 @@ +class AddOrderIdToOrders < ActiveRecord::Migration[5.1] + def change + add_column :orders, :order_id, :integer + end +end diff --git a/db/migrate/20171023040659_create_billings.rb b/db/migrate/20171023040659_create_billings.rb new file mode 100644 index 0000000000..2937120149 --- /dev/null +++ b/db/migrate/20171023040659_create_billings.rb @@ -0,0 +1,19 @@ +class CreateBillings < ActiveRecord::Migration[5.1] + def change + create_table :billings do |t| + t.string :street, null: false + t.string :apt + t.string :city, null: false + t.string :state, null: false + t.integer :ship_zip, null: false, length: 5 + + t.string :email, null: false + t.integer :credit_card, null: false, length: 16 + t.integer :exp, null: false, length: 4 + t.integer :cvv, null: false + t.integer :bill_zip, null: false, length: 5 + + t.timestamps + end + end +end diff --git a/db/migrate/20171023212500_add_null_false_to_products.rb b/db/migrate/20171023212500_add_null_false_to_products.rb new file mode 100644 index 0000000000..b554cf53f0 --- /dev/null +++ b/db/migrate/20171023212500_add_null_false_to_products.rb @@ -0,0 +1,5 @@ +class AddNullFalseToProducts < ActiveRecord::Migration[5.1] + def change + # decided not to use this + end +end diff --git a/db/migrate/20171023221318_remove_null_from_billing.rb b/db/migrate/20171023221318_remove_null_from_billing.rb new file mode 100644 index 0000000000..ae7659d375 --- /dev/null +++ b/db/migrate/20171023221318_remove_null_from_billing.rb @@ -0,0 +1,13 @@ +class RemoveNullFromBilling < ActiveRecord::Migration[5.1] + def change + change_column_null :billings, :street, :true + change_column_null :billings, :city, :true + change_column_null :billings, :state, :true + change_column_null :billings, :ship_zip, :true + change_column_null :billings, :email, :true + change_column_null :billings, :credit_card, :true + change_column_null :billings, :exp, :true + change_column_null :billings, :cvv, :true + change_column_null :billings, :bill_zip, :true + end +end diff --git a/db/migrate/20171023223527_set_length_to_review.rb b/db/migrate/20171023223527_set_length_to_review.rb new file mode 100644 index 0000000000..38e746ecf0 --- /dev/null +++ b/db/migrate/20171023223527_set_length_to_review.rb @@ -0,0 +1,8 @@ +class SetLengthToReview < ActiveRecord::Migration[5.1] + def self.down + change_column :reviews, :reviewtext + end + def self.up + change_column :reviews, :reviewtext, :string, length: 500 + end +end diff --git a/db/migrate/20171023224545_add_length_to_review.rb b/db/migrate/20171023224545_add_length_to_review.rb new file mode 100644 index 0000000000..606be91b93 --- /dev/null +++ b/db/migrate/20171023224545_add_length_to_review.rb @@ -0,0 +1,5 @@ +class AddLengthToReview < ActiveRecord::Migration[5.1] + def change + change_column :reviews, :reviewtext, :string, length: 500 + end +end diff --git a/db/migrate/20171024174101_correct_order_product_quantity_spelling.rb b/db/migrate/20171024174101_correct_order_product_quantity_spelling.rb new file mode 100644 index 0000000000..4358c65455 --- /dev/null +++ b/db/migrate/20171024174101_correct_order_product_quantity_spelling.rb @@ -0,0 +1,5 @@ +class CorrectOrderProductQuantitySpelling < ActiveRecord::Migration[5.1] + def change + rename_column :order_products, :quanitity, :quantity + end +end diff --git a/db/migrate/20171024174125_change_credit_card_format_to_sting.rb b/db/migrate/20171024174125_change_credit_card_format_to_sting.rb new file mode 100644 index 0000000000..92b3251e56 --- /dev/null +++ b/db/migrate/20171024174125_change_credit_card_format_to_sting.rb @@ -0,0 +1,5 @@ +class ChangeCreditCardFormatToSting < ActiveRecord::Migration[5.1] + def change + change_column :billings, :credit_card, :string + end +end diff --git a/db/migrate/20171024180242_add_name_to_billing.rb b/db/migrate/20171024180242_add_name_to_billing.rb new file mode 100644 index 0000000000..08e50bf566 --- /dev/null +++ b/db/migrate/20171024180242_add_name_to_billing.rb @@ -0,0 +1,5 @@ +class AddNameToBilling < ActiveRecord::Migration[5.1] + def change + add_column :billings, :name, :string + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 0000000000..2756976f80 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,85 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 20171024180242) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "billings", force: :cascade do |t| + t.string "street" + t.string "apt" + t.string "city" + t.string "state" + t.integer "ship_zip" + t.string "email" + t.string "credit_card" + t.integer "exp" + t.integer "cvv" + t.integer "bill_zip" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "name" + end + + create_table "categories", force: :cascade do |t| + t.string "category_name" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "merchants", force: :cascade do |t| + t.string "username" + t.string "email" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "provider", null: false + t.string "uid", null: false + end + + create_table "order_products", force: :cascade do |t| + t.integer "quantity" + t.integer "product_id" + t.integer "order_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "orders", force: :cascade do |t| + t.string "status" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.integer "user_id" + t.integer "order_id" + end + + create_table "products", force: :cascade do |t| + t.string "name" + t.string "description" + t.integer "price" + t.integer "stock" + t.integer "category_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "photo_URL" + t.integer "merchant_id" + end + + create_table "reviews", force: :cascade do |t| + t.integer "product_id" + t.integer "rating" + t.string "reviewtext" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/db/seed_data/categories.csv b/db/seed_data/categories.csv new file mode 100644 index 0000000000..54b12cf6ef --- /dev/null +++ b/db/seed_data/categories.csv @@ -0,0 +1,7 @@ +category_name +Appetizers +Breakfast +Lunch +Dinner +Desserts +Drinks diff --git a/db/seed_data/merchants.csv b/db/seed_data/merchants.csv new file mode 100644 index 0000000000..5b9b1b0580 --- /dev/null +++ b/db/seed_data/merchants.csv @@ -0,0 +1,8 @@ +username,email,provider,uid +john_smith,john_smith@fakemail.com,github,1234 +liza_lee,liza_lee@fakemail.com,github,12345 +linda_loop,linda_loop@fakemail.com,github,789 +jenny_jones,jenny_jones@mailing.com,github,900 +henny_penny,henny_penny@skyisfalling.com,github,1000 +dixie_pixie,dixie_pixie@pixiedust.com,github,42 +sally_racket,sally_racket@seashanty.edu,github,423 diff --git a/db/seed_data/products.csv b/db/seed_data/products.csv new file mode 100644 index 0000000000..d9539a8ed5 --- /dev/null +++ b/db/seed_data/products.csv @@ -0,0 +1,26 @@ +name,description,price,stock,category_id,photo_URL,merchant_id +Ginger Beer,Bubbly Bits of Ginger,10,10,6,https://static.pexels.com/photos/418225/pexels-photo-418225.jpeg,2 +Bubble Tea,Tea but with Bubbles,3,100,6,https://prods3.imgix.net/images/articles/2017_06/non-feature-bubble-tea-bad-health.jpg,5 +Lemonade,When Life Gives You Lemons,5,5,6,http://www.freefoodphotos.com/imagelibrary/drink/slides/lemonade_glasses.jpg,3 +Fruit Smoothie,This Smoothie Brings all the Vitamins to the Yard,7,4,6,http://www.freefoodphotos.com/imagelibrary/drink/slides/milkshake.jpg,7 +Shakshuka,Tomato and Egg Delight,10,10,2,https://images.food52.com/XriDgBBMyPKkfhmcNBNOfFrHMEY=/753x502/b51df01a-73a1-46df-b311-31fd6111d761--2014-0819_shakshuka-003.jpg,2 +Red Chilaquiles with Fried Eggs,Cheese and Eggs and Sauce Oh My!,17,10,6,https://images.food52.com/rzgZ01EXRiJd1szmmQTaws1UG-4=/753x502/f87d6799-35b8-4d96-a7c5-c624e1f70938--2015_0112_quick-red-chilaquiles-5651.jpg,2 +Brioche,Fancy Pastries to Start Your Day,3 Right,2,12,2,https://images.food52.com/Rt1n7F7N5qpmMofeWadqMJPHtC4=/753x502/12bcfa24-59e6-4b49-9aa2-6b0a31ab8830--brioche_yossy_arefi-15.jpg,1 +Pork Roll Breakfast Sandwich,New Jersey's Finest,5,10,2,http://myjerseyshorelife.com/wp-content/uploads/2016/08/13654367_621255891372198_576486027620737011_n-1.jpg,4 +Sinangag,Garlic Fried Rice with Vinegar Sauce,15,6,2,https://www.saveur.com/g00/3_c-6bbb.x78fajzw.htr_/c-6RTWJUMJZX77x24myyux78x3ax2fx2fbbb.x78fajzw.htrx2fx78nyjx78x2fx78fajzw.htrx2fknqjx78x2fx78ydqjx78x2f100_6c_x2fuzgqnhx2fnrutwyx2f7569x2f7569-65x2fwjhnuj_x78nsfslfl-knqnunst-lfwqnh-kwnji-wnhj_355c6755.oulx3fnytpx3daEz_3YTx78x26n65h.rfwp.nrflj.yduj_$/$/$/$/$/$/$/$/$/$/$,5 +Baked Ziti,Hometown Favorite,15,10,4,Ziti_URL,1 +Pad Thai,Noodle Delight,12,23,6,Noodle_URL,3 +Apple Pie,Flaky Crust,15,12,5,Pie_URL,3 +Lumpia,Not just Lumps,5,15,6,Lumpia_URL,2 +Cheesy Crackers,Like Crackers and Cheese,5,5,2,CheesyCrackersURL,1 +Tacos,Good Even on Wednesdays,12,12,3,Tacos_URL,3 +Japanese Chicken Skewers,Deliciously mouth-watering chicken from Japan,5,10,1,https://www.justonecookbook.com/wp-content/uploads/2014/04/Yakitori-II-600x900.jpg,2 +Brined and Cured fish,Raved Russian Snack,1,10,1,https://fthmb.tqn.com/FYTIvysPnUzMnypTZuuDicxyWWQ=/960x0/filters:no_upscale()/caviar-56a277413df78cf772764cc2.jpg,4 +Pan Fried Tofu with Spicy Sauce,KO-rean taste,1,1,https://www.maangchi.com/wp-content/uploads/2009/09/pan-fried-tofu.jpg,3 +Peel and Eat Shrimp with BBQ Sauce,American BBQ,5,10,1,https://imagesvc.timeincapp.com/v3/mm/image?url=http%3A%2F%2Fcdn-image.foodandwine.com%2Fsites%2Fdefault%2Ffiles%2FHD-fw200605_peelAndEat.jpg&w=800&q=85,4 +Laghman,Kyrgastan Dumpling,2,10,1,http://www.flickr.com/photos/garysoup/3581616346/,5 +Vigoron,Nicaraguan Lunch,5,10,3,http://www.whats4eats.com/files/styles/teaser/public/vegetables-vigoron-wikipedia-nicaraguan-food-4x3.jpg?itok=CWvTuYY3,6 +Scotch Egg,English Egg,3,2,3,http://www.whats4eats.com/appetizers/scotch-eggs-recipe,4 +Lechona,Colombian Meats!,4,2,3,https://www.google.com/url?sa=i&rct=j&q=&esrc=s&source=imgres&cd=&cad=rja&uact=8&ved=0ahUKEwjvkOzD8IrXAhWl0FQKHb-PCtYQjRwIBw&url=http%3A%2F%2Fconfidencialcolombia.com%2Fes%2F1%2F402%2F10245%2FSe-aprieta-la-%25E2%2580%2598lechona-navide%25C3%25B1a%25E2%2580%2599-en-Risaralda-cerdo-lechona-risaralda-salud-sacrificio-emfermedades.htm&psig=AOvVaw28-D8-bZBk9fOtzSEfIQok&ust=1508990155431524 +NYC Pizza,Crustalious Pizza,3,4,3,https://www.google.com/url?sa=i&rct=j&q=&esrc=s&source=images&cd=&cad=rja&uact=8&ved=0ahUKEwisx87v8orXAhXnilQKHZ4PDJMQjRwIBw&url=https%3A%2F%2Fwww.roughguides.com%2Farticle%2Fthe-true-history-of-new-york-pizza-a-grand-tour%2F&psig=AOvVaw1FybMpsRSeTTX2mP826a6h&ust=1508990765099947,7 +Steak Salad, Blue cheese topped steak,10,5,3,https://www.google.com/url?sa=i&rct=j&q=&esrc=s&source=images&cd=&cad=rja&uact=8&ved=0ahUKEwj9j_iG9IrXAhVlqlQKHZC4BAYQjRwIBw&url=https%3A%2F%2Fwww.pinterest.com%2Fexplore%2Fsteak-salad%2F&psig=AOvVaw0dRibumt33_Kz_b2OKC7wP&ust=1508991082719039,5 diff --git a/db/seed_data/reviews.csv b/db/seed_data/reviews.csv new file mode 100644 index 0000000000..53544701fb --- /dev/null +++ b/db/seed_data/reviews.csv @@ -0,0 +1,76 @@ +product_id,rating,reviewtext +1,5,Cake donut powder powder marshmallow jelly-o chocolate bar jelly beans croissant. Lemon drops jelly-o cake jelly-o pastry muffin. Cotton candy I love muffin oat cake croissant. I love lollipop tart pastry I love. +1,3,Bonbon tart macaroon powder jelly-o cookie pie. Chocolate bar marzipan jelly beans cake pudding lollipop candy canes sugar plum. Dragée cotton candy carrot cake. +1,1,Icing I love cake gummi bears candy topping liquorice I love liquorice. Biscuit biscuit gingerbread. Halvah cotton candy jujubes I love sesame snaps jelly chupa chups. Powder gummies dragée chupa chups cupcake cake gingerbread tootsie roll dessert. +2,4,Oat cake I love marzipan macaroon lollipop I love tootsie roll chupa chups. Gingerbread I love sesame snaps dragée croissant tart powder pudding cheesecake. Jujubes I love sesame snaps chupa chups biscuit cookie dragée. +2,4,Dessert cookie marshmallow sesame snaps. Tart fruitcake I love. Croissant fruitcake muffin I love pastry fruitcake pie ice cream pastry. I love cookie cake I love liquorice I love. +2,5,Cake donut powder powder marshmallow jelly-o chocolate bar jelly beans croissant. Lemon drops jelly-o cake jelly-o pastry muffin. Cotton candy I love muffin oat cake croissant. I love lollipop tart pastry I love. +2,1,Bonbon tart macaroon powder jelly-o cookie pie. Chocolate bar marzipan jelly beans cake pudding lollipop candy canes sugar plum. Dragée cotton candy carrot cake. +3,3,Icing I love cake gummi bears candy topping liquorice I love liquorice. Biscuit biscuit gingerbread. Halvah cotton candy jujubes I love sesame snaps jelly chupa chups. Powder gummies dragée chupa chups cupcake cake gingerbread tootsie roll dessert. +3,5,Oat cake I love marzipan macaroon lollipop I love tootsie roll chupa chups. Gingerbread I love sesame snaps dragée croissant tart powder pudding cheesecake. Jujubes I love sesame snaps chupa chups biscuit cookie dragée. +3,5,Dessert cookie marshmallow sesame snaps. Tart fruitcake I love. Croissant fruitcake muffin I love pastry fruitcake pie ice cream pastry. I love cookie cake I love liquorice I love. +4,2,Cake donut powder powder marshmallow jelly-o chocolate bar jelly beans croissant. Lemon drops jelly-o cake jelly-o pastry muffin. Cotton candy I love muffin oat cake croissant. I love lollipop tart pastry I love. +4,1,Bonbon tart macaroon powder jelly-o cookie pie. Chocolate bar marzipan jelly beans cake pudding lollipop candy canes sugar plum. Dragée cotton candy carrot cake. +5,1,Icing I love cake gummi bears candy topping liquorice I love liquorice. Biscuit biscuit gingerbread. Halvah cotton candy jujubes I love sesame snaps jelly chupa chups. Powder gummies dragée chupa chups cupcake cake gingerbread tootsie roll dessert. +5,5,Oat cake I love marzipan macaroon lollipop I love tootsie roll chupa chups. Gingerbread I love sesame snaps dragée croissant tart powder pudding cheesecake. Jujubes I love sesame snaps chupa chups biscuit cookie dragée. +5,5,Dessert cookie marshmallow sesame snaps. Tart fruitcake I love. Croissant fruitcake muffin I love pastry fruitcake pie ice cream pastry. I love cookie cake I love liquorice I love. +6,5,Cake donut powder powder marshmallow jelly-o chocolate bar jelly beans croissant. Lemon drops jelly-o cake jelly-o pastry muffin. Cotton candy I love muffin oat cake croissant. I love lollipop tart pastry I love. +6,3,Bonbon tart macaroon powder jelly-o cookie pie. Chocolate bar marzipan jelly beans cake pudding lollipop candy canes sugar plum. Dragée cotton candy carrot cake. +6,1,Icing I love cake gummi bears candy topping liquorice I love liquorice. Biscuit biscuit gingerbread. Halvah cotton candy jujubes I love sesame snaps jelly chupa chups. Powder gummies dragée chupa chups cupcake cake gingerbread tootsie roll dessert. +7,4,Oat cake I love marzipan macaroon lollipop I love tootsie roll chupa chups. Gingerbread I love sesame snaps dragée croissant tart powder pudding cheesecake. Jujubes I love sesame snaps chupa chups biscuit cookie dragée. +7,4,Dessert cookie marshmallow sesame snaps. Tart fruitcake I love. Croissant fruitcake muffin I love pastry fruitcake pie ice cream pastry. I love cookie cake I love liquorice I love. +7,5,Cake donut powder powder marshmallow jelly-o chocolate bar jelly beans croissant. Lemon drops jelly-o cake jelly-o pastry muffin. Cotton candy I love muffin oat cake croissant. I love lollipop tart pastry I love. +7,1,Bonbon tart macaroon powder jelly-o cookie pie. Chocolate bar marzipan jelly beans cake pudding lollipop candy canes sugar plum. Dragée cotton candy carrot cake. +8,3,Icing I love cake gummi bears candy topping liquorice I love liquorice. Biscuit biscuit gingerbread. Halvah cotton candy jujubes I love sesame snaps jelly chupa chups. Powder gummies dragée chupa chups cupcake cake gingerbread tootsie roll dessert. +8,5,Oat cake I love marzipan macaroon lollipop I love tootsie roll chupa chups. Gingerbread I love sesame snaps dragée croissant tart powder pudding cheesecake. Jujubes I love sesame snaps chupa chups biscuit cookie dragée. +8,5,Dessert cookie marshmallow sesame snaps. Tart fruitcake I love. Croissant fruitcake muffin I love pastry fruitcake pie ice cream pastry. I love cookie cake I love liquorice I love. +9,2,Cake donut powder powder marshmallow jelly-o chocolate bar jelly beans croissant. Lemon drops jelly-o cake jelly-o pastry muffin. Cotton candy I love muffin oat cake croissant. I love lollipop tart pastry I love. +9,1,Bonbon tart macaroon powder jelly-o cookie pie. Chocolate bar marzipan jelly beans cake pudding lollipop candy canes sugar plum. Dragée cotton candy carrot cake. +10,1,Icing I love cake gummi bears candy topping liquorice I love liquorice. Biscuit biscuit gingerbread. Halvah cotton candy jujubes I love sesame snaps jelly chupa chups. Powder gummies dragée chupa chups cupcake cake gingerbread tootsie roll dessert. +10,5,Oat cake I love marzipan macaroon lollipop I love tootsie roll chupa chups. Gingerbread I love sesame snaps dragée croissant tart powder pudding cheesecake. Jujubes I love sesame snaps chupa chups biscuit cookie dragée. +10,5,Dessert cookie marshmallow sesame snaps. Tart fruitcake I love. Croissant fruitcake muffin I love pastry fruitcake pie ice cream pastry. I love cookie cake I love liquorice I love. +11,5,Cake donut powder powder marshmallow jelly-o chocolate bar jelly beans croissant. Lemon drops jelly-o cake jelly-o pastry muffin. Cotton candy I love muffin oat cake croissant. I love lollipop tart pastry I love. +11,3,Bonbon tart macaroon powder jelly-o cookie pie. Chocolate bar marzipan jelly beans cake pudding lollipop candy canes sugar plum. Dragée cotton candy carrot cake. +11,1,Icing I love cake gummi bears candy topping liquorice I love liquorice. Biscuit biscuit gingerbread. Halvah cotton candy jujubes I love sesame snaps jelly chupa chups. Powder gummies dragée chupa chups cupcake cake gingerbread tootsie roll dessert. +12,4,Oat cake I love marzipan macaroon lollipop I love tootsie roll chupa chups. Gingerbread I love sesame snaps dragée croissant tart powder pudding cheesecake. Jujubes I love sesame snaps chupa chups biscuit cookie dragée. +12,4,Dessert cookie marshmallow sesame snaps. Tart fruitcake I love. Croissant fruitcake muffin I love pastry fruitcake pie ice cream pastry. I love cookie cake I love liquorice I love. +12,5,Cake donut powder powder marshmallow jelly-o chocolate bar jelly beans croissant. Lemon drops jelly-o cake jelly-o pastry muffin. Cotton candy I love muffin oat cake croissant. I love lollipop tart pastry I love. +12,1,Bonbon tart macaroon powder jelly-o cookie pie. Chocolate bar marzipan jelly beans cake pudding lollipop candy canes sugar plum. Dragée cotton candy carrot cake. +13,3,Icing I love cake gummi bears candy topping liquorice I love liquorice. Biscuit biscuit gingerbread. Halvah cotton candy jujubes I love sesame snaps jelly chupa chups. Powder gummies dragée chupa chups cupcake cake gingerbread tootsie roll dessert. +13,5,Oat cake I love marzipan macaroon lollipop I love tootsie roll chupa chups. Gingerbread I love sesame snaps dragée croissant tart powder pudding cheesecake. Jujubes I love sesame snaps chupa chups biscuit cookie dragée. +13,5,Dessert cookie marshmallow sesame snaps. Tart fruitcake I love. Croissant fruitcake muffin I love pastry fruitcake pie ice cream pastry. I love cookie cake I love liquorice I love. +14,2,Cake donut powder powder marshmallow jelly-o chocolate bar jelly beans croissant. Lemon drops jelly-o cake jelly-o pastry muffin. Cotton candy I love muffin oat cake croissant. I love lollipop tart pastry I love. +14,1,Bonbon tart macaroon powder jelly-o cookie pie. Chocolate bar marzipan jelly beans cake pudding lollipop candy canes sugar plum. Dragée cotton candy carrot cake. +15,1,Icing I love cake gummi bears candy topping liquorice I love liquorice. Biscuit biscuit gingerbread. Halvah cotton candy jujubes I love sesame snaps jelly chupa chups. Powder gummies dragée chupa chups cupcake cake gingerbread tootsie roll dessert. +15,5,Oat cake I love marzipan macaroon lollipop I love tootsie roll chupa chups. Gingerbread I love sesame snaps dragée croissant tart powder pudding cheesecake. Jujubes I love sesame snaps chupa chups biscuit cookie dragée. +15,5,Dessert cookie marshmallow sesame snaps. Tart fruitcake I love. Croissant fruitcake muffin I love pastry fruitcake pie ice cream pastry. I love cookie cake I love liquorice I love. +16,5,Cake donut powder powder marshmallow jelly-o chocolate bar jelly beans croissant. Lemon drops jelly-o cake jelly-o pastry muffin. Cotton candy I love muffin oat cake croissant. I love lollipop tart pastry I love. +16,3,Bonbon tart macaroon powder jelly-o cookie pie. Chocolate bar marzipan jelly beans cake pudding lollipop candy canes sugar plum. Dragée cotton candy carrot cake. +16,1,Icing I love cake gummi bears candy topping liquorice I love liquorice. Biscuit biscuit gingerbread. Halvah cotton candy jujubes I love sesame snaps jelly chupa chups. Powder gummies dragée chupa chups cupcake cake gingerbread tootsie roll dessert. +17,4,Oat cake I love marzipan macaroon lollipop I love tootsie roll chupa chups. Gingerbread I love sesame snaps dragée croissant tart powder pudding cheesecake. Jujubes I love sesame snaps chupa chups biscuit cookie dragée. +17,4,Dessert cookie marshmallow sesame snaps. Tart fruitcake I love. Croissant fruitcake muffin I love pastry fruitcake pie ice cream pastry. I love cookie cake I love liquorice I love. +17,5,Cake donut powder powder marshmallow jelly-o chocolate bar jelly beans croissant. Lemon drops jelly-o cake jelly-o pastry muffin. Cotton candy I love muffin oat cake croissant. I love lollipop tart pastry I love. +17,1,Bonbon tart macaroon powder jelly-o cookie pie. Chocolate bar marzipan jelly beans cake pudding lollipop candy canes sugar plum. Dragée cotton candy carrot cake. +18,3,Icing I love cake gummi bears candy topping liquorice I love liquorice. Biscuit biscuit gingerbread. Halvah cotton candy jujubes I love sesame snaps jelly chupa chups. Powder gummies dragée chupa chups cupcake cake gingerbread tootsie roll dessert. +18,5,Oat cake I love marzipan macaroon lollipop I love tootsie roll chupa chups. Gingerbread I love sesame snaps dragée croissant tart powder pudding cheesecake. Jujubes I love sesame snaps chupa chups biscuit cookie dragée. +18,5,Dessert cookie marshmallow sesame snaps. Tart fruitcake I love. Croissant fruitcake muffin I love pastry fruitcake pie ice cream pastry. I love cookie cake I love liquorice I love. +19,2,Cake donut powder powder marshmallow jelly-o chocolate bar jelly beans croissant. Lemon drops jelly-o cake jelly-o pastry muffin. Cotton candy I love muffin oat cake croissant. I love lollipop tart pastry I love. +19,1,Bonbon tart macaroon powder jelly-o cookie pie. Chocolate bar marzipan jelly beans cake pudding lollipop candy canes sugar plum. Dragée cotton candy carrot cake. +20,1,Icing I love cake gummi bears candy topping liquorice I love liquorice. Biscuit biscuit gingerbread. Halvah cotton candy jujubes I love sesame snaps jelly chupa chups. Powder gummies dragée chupa chups cupcake cake gingerbread tootsie roll dessert. +20,5,Oat cake I love marzipan macaroon lollipop I love tootsie roll chupa chups. Gingerbread I love sesame snaps dragée croissant tart powder pudding cheesecake. Jujubes I love sesame snaps chupa chups biscuit cookie dragée. +20,5,Dessert cookie marshmallow sesame snaps. Tart fruitcake I love. Croissant fruitcake muffin I love pastry fruitcake pie ice cream pastry. I love cookie cake I love liquorice I love. +21,5,Cake donut powder powder marshmallow jelly-o chocolate bar jelly beans croissant. Lemon drops jelly-o cake jelly-o pastry muffin. Cotton candy I love muffin oat cake croissant. I love lollipop tart pastry I love. +21,3,Bonbon tart macaroon powder jelly-o cookie pie. Chocolate bar marzipan jelly beans cake pudding lollipop candy canes sugar plum. Dragée cotton candy carrot cake. +21,1,Icing I love cake gummi bears candy topping liquorice I love liquorice. Biscuit biscuit gingerbread. Halvah cotton candy jujubes I love sesame snaps jelly chupa chups. Powder gummies dragée chupa chups cupcake cake gingerbread tootsie roll dessert. +22,4,Oat cake I love marzipan macaroon lollipop I love tootsie roll chupa chups. Gingerbread I love sesame snaps dragée croissant tart powder pudding cheesecake. Jujubes I love sesame snaps chupa chups biscuit cookie dragée. +22,4,Dessert cookie marshmallow sesame snaps. Tart fruitcake I love. Croissant fruitcake muffin I love pastry fruitcake pie ice cream pastry. I love cookie cake I love liquorice I love. +22,5,Cake donut powder powder marshmallow jelly-o chocolate bar jelly beans croissant. Lemon drops jelly-o cake jelly-o pastry muffin. Cotton candy I love muffin oat cake croissant. I love lollipop tart pastry I love. +22,1,Bonbon tart macaroon powder jelly-o cookie pie. Chocolate bar marzipan jelly beans cake pudding lollipop candy canes sugar plum. Dragée cotton candy carrot cake. +23,3,Icing I love cake gummi bears candy topping liquorice I love liquorice. Biscuit biscuit gingerbread. Halvah cotton candy jujubes I love sesame snaps jelly chupa chups. Powder gummies dragée chupa chups cupcake cake gingerbread tootsie roll dessert. +23,5,Oat cake I love marzipan macaroon lollipop I love tootsie roll chupa chups. Gingerbread I love sesame snaps dragée croissant tart powder pudding cheesecake. Jujubes I love sesame snaps chupa chups biscuit cookie dragée. +23,5,Dessert cookie marshmallow sesame snaps. Tart fruitcake I love. Croissant fruitcake muffin I love pastry fruitcake pie ice cream pastry. I love cookie cake I love liquorice I love. +24,2,Cake donut powder powder marshmallow jelly-o chocolate bar jelly beans croissant. Lemon drops jelly-o cake jelly-o pastry muffin. Cotton candy I love muffin oat cake croissant. I love lollipop tart pastry I love. +24,1,Bonbon tart macaroon powder jelly-o cookie pie. Chocolate bar marzipan jelly beans cake pudding lollipop candy canes sugar plum. Dragée cotton candy carrot cake. +25,1,Icing I love cake gummi bears candy topping liquorice I love liquorice. Biscuit biscuit gingerbread. Halvah cotton candy jujubes I love sesame snaps jelly chupa chups. Powder gummies dragée chupa chups cupcake cake gingerbread tootsie roll dessert. +25,5,Oat cake I love marzipan macaroon lollipop I love tootsie roll chupa chups. Gingerbread I love sesame snaps dragée croissant tart powder pudding cheesecake. Jujubes I love sesame snaps chupa chups biscuit cookie dragée. +25,5,Dessert cookie marshmallow sesame snaps. Tart fruitcake I love. Croissant fruitcake muffin I love pastry fruitcake pie ice cream pastry. I love cookie cake I love liquorice I love. diff --git a/db/seeds.rb b/db/seeds.rb new file mode 100644 index 0000000000..cd00a6cd0a --- /dev/null +++ b/db/seeds.rb @@ -0,0 +1,97 @@ +# This file should contain all the record creation needed to seed the database with its default values. +# The data can then be loaded with the rails db:seed command (or created alongside the database with db:setup). +# +# Examples: +# +# movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) +# Character.create(name: 'Luke', movie: movies.first) +require 'csv' + + +#merchant data +MERCHANT_FILE = Rails.root.join('db', 'seed_data', 'merchants.csv') +puts "Loading raw merchant data from #{MERCHANT_FILE}" + +merchant_failures = [] +CSV.foreach(MERCHANT_FILE, :headers => true) do |row| + merchant = Merchant.new + merchant.username = row['username'] + merchant.email = row['email'] + merchant.provider = row['provider'] + merchant.uid = row['uid'] + + puts "Created merchant: #{merchant.inspect}" + successful = merchant.save + if !successful + merchant_failures << merchant + end +end + +puts "Added #{Merchant.count} merchant records" +puts "#{merchant_failures.length} merchants failed to save" + +# category data + +CATEGORY_FILE = Rails.root.join('db', 'seed_data', 'categories.csv') +puts "Loading raw category data from #{CATEGORY_FILE}" + +category_failures = [] +CSV.foreach(CATEGORY_FILE, :headers => true) do |row| + category = Category.new + category.category_name = row['category_name'] + + + puts "Created category: #{category.inspect}" + successful = category.save + if !successful + category_failures << category + end +end + +puts "Added #{Category.count} category records" +puts "#{category_failures.length} categories failed to save" +#product data + +PRODUCT_FILE = Rails.root.join('db', 'seed_data', 'products.csv') +puts "Loading raw product data from #{PRODUCT_FILE}" +product_failures = [] +CSV.foreach(PRODUCT_FILE, :headers => true) do |row| + product = Product.new + product.name = row['name'] + product.description = row['description'] + product.price = row["price"] + product.stock = row["stock"] + product.category_id = row["category_id"] + product.photo_URL = row["photo_URL"] + product.merchant_id = row["merchant_id"] + + puts "Created product: #{product.inspect}" + successful = product.save + if !successful + product_failures << product + end +end + +puts "Added #{Product.count} product records" +puts "#{product_failures.length} products failed to save" + +# reviews + +REVIEW_FILE = Rails.root.join('db', 'seed_data', 'reviews.csv') +puts "Loading raw product data from #{REVIEW_FILE}" +product_failures = [] +CSV.foreach(REVIEW_FILE, :headers => true) do |row| + review = Review.new + review.product_id = row['product_id'] + review.rating = row['rating'] + review.reviewtext = row["reviewtext"] + + puts "Created review: #{review.inspect}" + successful = review.save + if !successful + review_failures << review + end +end + +puts "Added #{Product.count} product records" +puts "#{product_failures.length} products failed to save" diff --git a/feedback.md b/feedback.md index b958bb8713..399771e2d3 100644 --- a/feedback.md +++ b/feedback.md @@ -10,10 +10,10 @@ | Heroku instance is online | | | **General** | | | Nested routes follow RESTful conventions | | -| oAuth used for User authentication | | +| oAuth used for Merchant authentication | | | Functionality restricted based on user roles | | | Products can be added and removed from cart | | -| Users can view past orders | | +| Merchants can view past orders | | | Merchants can add, edit and view their products | | | Errors are reported to the user | | | **Order Functionality** | | diff --git a/lib/assets/.keep b/lib/assets/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/log/.keep b/log/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/package.json b/package.json new file mode 100644 index 0000000000..f874acf437 --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "name": "betsy", + "private": true, + "dependencies": {} +} diff --git a/public/404.html b/public/404.html new file mode 100644 index 0000000000..2be3af26fc --- /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 0000000000..c08eac0d1d --- /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 0000000000..78a030af22 --- /dev/null +++ b/public/500.html @@ -0,0 +1,66 @@ + + + + We're sorry, but something went wrong (500) + + + + + + +
+
+

We're sorry, but something went wrong.

+
+

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

+
+ + diff --git a/public/apple-touch-icon-precomposed.png b/public/apple-touch-icon-precomposed.png new file mode 100644 index 0000000000..e69de29bb2 diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png new file mode 100644 index 0000000000..e69de29bb2 diff --git a/public/favicon.ico b/public/favicon.ico new file mode 100644 index 0000000000..e69de29bb2 diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 0000000000..37b576a4a0 --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb new file mode 100644 index 0000000000..d19212abd5 --- /dev/null +++ b/test/application_system_test_case.rb @@ -0,0 +1,5 @@ +require "test_helper" + +class ApplicationSystemTestCase < ActionDispatch::SystemTestCase + driven_by :selenium, using: :chrome, screen_size: [1400, 1400] +end diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/controllers/categories_controller_test.rb b/test/controllers/categories_controller_test.rb new file mode 100644 index 0000000000..3dd7095cb8 --- /dev/null +++ b/test/controllers/categories_controller_test.rb @@ -0,0 +1,187 @@ +require "test_helper" +require 'pry' + + +describe CategoriesController do + + describe "index" do + it "gets a list of categories" do + get categories_path + must_respond_with :success + end #gets list of categories + + it "returns a success status when no categories" do + Category.destroy_all + get categories_path + must_respond_with :success + end #no categories + end #index tests + + describe "show" do + it "should get show" do + get category_path(categories(:cat_one).id) + must_respond_with :success + end #get show + + it "return success when given a valid category id" do + category_id = Category.first.id + get category_path(category_id) + must_respond_with :success + end #return success + + it "returns not found when given an invalid product id" do + category_id = Category.last.id + 1 + get category_path(category_id) + must_respond_with :not_found + end #return not found + end #return show + +### Guest user restrictions + +#things guess users can/cannot do +describe "Guest user access" do + it "can access the index" do + get categories_path + must_respond_with :success + end #index + + it "can access show page" do + category_id = Category.first.id + get category_path(category_id) + must_respond_with :success + end + + it "cannot access new" do + get new_category_path + must_redirect_to root_path + flash[:message].must_equal "You must be logged in to do that!" + end #new + + it "cannot access edit" do + category_id = Category.first.id + get edit_category_path(category_id) + must_redirect_to root_path + flash[:message].must_equal "You must be logged in to do that!" + end + + it "cannot access destroy" do + category_id = Category.first.id + delete category_path(category_id) + must_redirect_to root_path + flash[:message].must_equal "You must be logged in to do that!" + end +end #guest users + + +#### Logged in users only + describe "Logged in users" do + before do + login(merchants(:fake_user)) + end #login + + describe "new" do + it "returns a success status" do + get new_category_path + must_respond_with :success + end #return success + end #new tests + + describe "create" do + it "creates a valid category when data is valid" do + + category_data = { + category: { + category_name: "abcdefg" + } + } + + start_category_count = Category.count + Category.new(category_data[:category]).must_be :valid? + + post categories_path, params: category_data + + must_respond_with :redirect + must_redirect_to categories_path + + Category.count.must_equal start_category_count + 1 + + end #valid data test + + + it "will not create a new category when data is invalid" do + invalid_category_data = { + category: { + category_name: "" + } + } + start_category_count = Category.count + + Category.new(invalid_category_data[:category]).wont_be :valid? + + post categories_path, params: invalid_category_data + must_respond_with :bad_request + + Category.count.must_equal start_category_count + end #invalid data test + end #create tests + + + describe "edit" do + it "returns success when given a valid category id" do + get edit_category_path(categories(:cat_one).id) + must_respond_with :success + end #success for edit + + it "returns not found when given an invalid cateogry id" do + invalid_category_id = Category.last.id + 1 + get edit_category_path(invalid_category_id) + must_respond_with :not_found + end #not found when not found + end #all edit tests + + describe "update" do + it "returns success if category id is valid and change is valid" do + category = Category.first + category_data = { + category: { + category_name: "Test" + } + } + category.update_attributes(category_data[:category]) + category.must_be :valid? + patch category_path(category), params: category_data + end #return success on valid change + + it "returns not found if the work id is invalid" do + category_id = Category.last.id + 1 + get category_path(category_id) + must_respond_with :not_found + end #returns not found if work is invalid + end #update tests + + describe "destroy" do + it "destroys the category when given a valid ID and that category is empty and redirects to categories path" do + category_id = Category.last.id + delete category_path(category_id) + + must_respond_with :redirect + must_redirect_to categories_path + Category.find_by(id: category_id).must_be_nil + end #successful destroy + + it "returns not_found when given an invalid ID" do + invalid_category_id = Category.last.id + 1 + start_category_count = Category.count + delete category_path(invalid_category_id) + must_respond_with :not_found + Category.count.must_equal start_category_count + end #invalid id destroy + + it "will not destroy a category that contains products." do + category_id = Category.first.id + delete category_path(category_id) + must_respond_with :bad_request + end + end #destroy tests +end #logged in user tests +end #all tests diff --git a/test/controllers/merchants_controller_test.rb b/test/controllers/merchants_controller_test.rb new file mode 100644 index 0000000000..87a7286267 --- /dev/null +++ b/test/controllers/merchants_controller_test.rb @@ -0,0 +1,101 @@ +require "test_helper" + +describe MerchantsController do + describe "index" do + it "renders page with all merchants" do + get merchants_path + must_respond_with :success + end + + it "responds with success when there are no merchants" do + Merchant.destroy_all + get merchants_path + must_respond_with :success + end + end #end index + + + describe "show" do + it "success for vaild merchant ID" do + get merchant_path(Merchant.first.id) + must_respond_with :success + end + + it "gives not_found for bogus merchant ID" do + bogus_merchant = Merchant.last.id + 1 + + get merchant_path(bogus_merchant) + must_respond_with :not_found + + end + end # end show +end #all +# describe "new" do +# it "Successfully makes a new merchant" do +# get new_merchant_path +# must_respond_with :success +# end +# end # end new + +# describe "create" do +# it "adds the merchant to the DB and redirects when the merchant data is valid" do +# merchant_data = { +# merchant: { +# username: "Test merchant", +# email: "fake@email.com" +# } +# } +# +# start_merchant_count = Merchant.count +# +# Merchant.new(merchant_data[:merchant]).must_be :valid? +# +# post merchants_path, params: merchant_data +# +# must_respond_with :redirect +# must_redirect_to merchants_path +# +# Merchant.count.must_equal start_merchant_count + 1 +# end +# end + + + +# describe "edit" do +# it "success for vaild merchant ID" do +# get edit_merchant_path(Merchant.first.id) +# must_respond_with :success +# end +# +# it "gives not_found for bogus merchant ID" do +# bogus_merchant = Merchant.last.id + 1 +# get edit_merchant_path(bogus_merchant) +# must_respond_with :not_found +# end +# end +# +# describe "update" do +# it "returns success if the merchant ID is valid and the change is valid" do +# merchant = Merchant.first +# merchant_data = { +# merchant: { +# username: "test-user", +# email: "fake@fake.com" +# } +# } +# merchant.update_attributes(merchant_data[:merchant]) +# +# merchant.must_be :valid?, "Test is invalid because the provided data will produce an invalid merchant" +# +# patch merchant_path(merchant), params: merchant_data +# +# +# must_respond_with :redirect +# must_redirect_to merchant_path(merchant) +# +# # Check that the change went through +# merchant.reload +# merchant.username.must_equal merchant_data[:merchant][:username] +# +# +# end diff --git a/test/controllers/orders_controller_test.rb b/test/controllers/orders_controller_test.rb new file mode 100644 index 0000000000..84771c534e --- /dev/null +++ b/test/controllers/orders_controller_test.rb @@ -0,0 +1,70 @@ +require "test_helper" + +describe OrdersController do + + describe "show" do + it "return success when given a valid order id" do + merchant = merchants(:fake_user) + order = orders(:one) + setup { login(merchant) } + + session[:order_id].must_equal order.id + + # order_id = Order.first.id + # get order_path(order_id) + # must_respond_with :success + end #valid + + it "gives not_found for a bogus order id" do + bogus_order_id = Order.last.id + 1 + + get order_path(bogus_order_id) + must_respond_with :not_found + end # invalid id + + #will create new cart if doesn't find one + # it "returns not found when given an invalid product id" do + # order_id = Order.last.id + 1 + # get order_path(order_id) + # must_respond_with :not_found + # end #invalid + end #show + + describe "Billing Form" do + it "Will Render the Billing Form" do + order_id = 1 + get billing_form_path + must_respond_with :success + end + end + + describe "Submit" do + it "will return success if order was submitted" do + @billing = billings(:one) + must_respond_with :success + end + + it "will return failure if order was not submitted" do + end + end + + # def submit + # # billing = Billing.find_by(id:session[:order_id]) + # @order = Order.find_by(id:session[:order_id], status: "pending") + # @order.subtract_products + # + # @billing = Billing.new(billing_params) + # + # if @billing.save + # @order.status = "paid" + # flash[:status] = :success + # flash[:message] = "Successfully submitted your order" + # session[:order_id] = nil + # else + # flash.now[:status] = :failure + # flash.now[:message] = "Failed submit your order" + # end + # render :show_order + # end + +end #all diff --git a/test/controllers/orders_products_controller_test.rb b/test/controllers/orders_products_controller_test.rb new file mode 100644 index 0000000000..371d50824e --- /dev/null +++ b/test/controllers/orders_products_controller_test.rb @@ -0,0 +1,4 @@ +require "test_helper" + +describe OrdersProductsController do +end diff --git a/test/controllers/products_controller_test.rb b/test/controllers/products_controller_test.rb new file mode 100644 index 0000000000..f9ad3c4863 --- /dev/null +++ b/test/controllers/products_controller_test.rb @@ -0,0 +1,182 @@ +require "test_helper" + + +describe ProductsController do + +#all users + describe "index" do + it "gets a list of products" do + get products_path + must_respond_with :success + end #get list + + it "returns a success status when no products" do + Product.destroy_all + get products_path + must_respond_with :success + end #no products + end #index tests + + describe "show" do + it "return success when given a valid product id" do + product_id = Product.first.id + get product_path(product_id) + must_respond_with :success + end + + it "returns not found when given an invalid product id" do + product_id = Product.last.id + 1 + get product_path(product_id) + must_respond_with :not_found + end + end + +#things guess users can/cannot do +describe "Guest user access" do + it "can access the index" do + get products_path + must_respond_with :success + end #index + + it "can access show page" do + product_id = Product.first.id + get product_path(product_id) + must_respond_with :success + end + + it "cannot access new" do + get new_product_path + must_redirect_to root_path + flash[:message].must_equal "You must be logged in to do that!" + end #new + + it "cannot access edit" do + product_id = Product.first.id + get edit_product_path(product_id) + must_redirect_to root_path + flash[:message].must_equal "You must be logged in to do that!" + end + + it "cannot access destroy" do + product_id = Product.first.id + delete product_path(product_id) + must_redirect_to root_path + flash[:message].must_equal "You must be logged in to do that!" + end + +end #guest users + + + #Tests for things only logged in users can do + describe "Logged in users" do + before do + login(merchants(:fake_user)) + end #login + + describe "new" do + it "returns a success status" do + get new_product_path + must_respond_with :success + end #succes + end #new tests + + describe "create" do + it "redirects to products_path when product data is valid" do + # test failing because i need to add test data for merchant and category + valid_product_data = { + product: { + name: "test product", + stock: 10, + price: 12, + merchant_id: merchants(:fake_user).id, + category_id: categories(:cat_one).id + } + } + start_product_count = Product.count + + Product.new(valid_product_data[:product]).must_be :valid? + post products_path, params: valid_product_data + must_respond_with :redirect + must_redirect_to products_path + + Product.count.must_equal start_product_count + 1 + end #create when data is valid + + it "sends bad request when product data is invalid" do + invalid_product_data = { + product: { + name: "", + price: "12" + } + } + Product.new(invalid_product_data[:product]).wont_be :valid? + + start_product_count = Product.count + post products_path, params: invalid_product_data + must_respond_with :bad_request + + Product.count.must_equal start_product_count + end #create when data is not valid + end #create tests + + describe "edit" do + it "returns success when given a valid product id" do + product_id = Product.first.id + get edit_product_path(product_id) + must_respond_with :success + end #edit success + + it "returns not found when given an invalid product id" do + invalid_product_id = Product.last.id + 1 + get edit_product_path(invalid_product_id) + must_respond_with :not_found + end #edit failure + end #all edit + + describe "update" do + it "returns success if product id valid and change is valid" do + product = Product.first + valid_product_data = { + product: { + name: "test product", + stock: 10, + price: 12, + merchant_id: merchants(:fake_user).id, + category_id: categories(:cat_one).id + } + } + product.update_attributes(valid_product_data[:product]) + product.must_be :valid? + patch product_path(product), params: valid_product_data + end #update + + it "returns not found if the work id is invalid" do + product_id = Product.last.id + 1 + get product_path(product_id) + must_respond_with :not_found + end #invalid + end #all update tests + + describe "destroy" do + it "succeeds for an extant work ID" do + product_id = Product.first.id + + delete product_path(product_id) + must_redirect_to root_path + + Product.find_by(id: product_id).must_be_nil + end #success + + it "does not destroy a product that does not exist and renders not found." do + start_count = Product.count + + bogus_work_id = Product.last.id + 1 + delete product_path(bogus_work_id) + must_respond_with :not_found + + Product.count.must_equal start_count + end #failure + end #destroy tests + end #logged in + +end #all tests diff --git a/test/controllers/reviews_controller_test.rb b/test/controllers/reviews_controller_test.rb new file mode 100644 index 0000000000..2aa6d7bcd8 --- /dev/null +++ b/test/controllers/reviews_controller_test.rb @@ -0,0 +1,69 @@ +require "test_helper" + +describe ReviewsController do + + describe "new" do + it "returns success with a valid product_id" do + valid_product_id = Product.first.id + get new_product_review_path(valid_product_id) + must_respond_with :success + end #valid id + + it "returns not found in product doesn't exist" do + invalid_product_id = Product.last.id + 1 + get new_product_review_path(invalid_product_id) + must_respond_with :not_found + end #no product + end #new tests + # @product = Product.find(params[:product_id]) + # @review = @product.reviews.build(review_params) + + describe "create" do + it "creates a review when data is valid" do + + review_data = { + review: { + product_id: 1, + rating: 3, + reviewtext: "review text" + } + } + + @product = Product.first + start_review_count = Review.count + a = @product.reviews.build(review_data[:review]) + a.must_be :valid? + + post product_reviews_path(@product.id), params:review_data + + must_respond_with :redirect + must_redirect_to root_path + + Review.count.must_equal start_review_count + 1 + end #valid data test + + it "will not create a new review when data is invalid" do + invalid_review_data = { + review: { + rating: "" + } + } + start_review_count = Review.count + + @product = Product.first + start_review_count = Review.count + a = @product.reviews.build(invalid_review_data[:review]) + a.wont_be :valid? + + post product_reviews_path(@product.id), params:invalid_review_data + + must_respond_with :bad_request + # must_redirect_to root_path + + Review.count.must_equal start_review_count + end #invalid data test + end #create tests +end #all tests +# product_reviews GET /products/:product_id/reviews(.:format) reviews#index +# POST /products/:product_id/reviews(.:format) reviews#create +# new_product_review GET /products/:product_id/reviews/new(.:format) reviews#new diff --git a/test/controllers/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb new file mode 100644 index 0000000000..053e7a4f0b --- /dev/null +++ b/test/controllers/sessions_controller_test.rb @@ -0,0 +1,111 @@ +require "test_helper" + +describe SessionsController do + describe "auth_callback" do + it "logs in an existing user" do + start_count = Merchant.count + merchant = merchants(:fake_user) + + login(merchant) + must_redirect_to root_path + session[:merchant_id].must_equal merchant.id + + # Should *not* have created a new user + Merchant.count.must_equal start_count + end + + it "creates a new user" do + start_count = Merchant.count + user = Merchant.new(provider: "github", uid: 99999, username: "test_user", email: "test@user.com") + + OmniAuth.config.mock_auth[:github] = OmniAuth::AuthHash.new(mock_auth_hash(user)) + get auth_callback_path(:github) + + must_redirect_to root_path + + # Should have created a new user + Merchant.count.must_equal start_count + 1 + + # The new user's ID should be set in the session + session[:merchant_id].must_equal Merchant.last.id + end + # + # it "redirects to the login route if given invalid user data" do + # end + it "tells a users that they are already logged in if that is true" do + + end + end + + # describe 'login' do + # it 'sign in should redirect to root_path' do + # fake_user = Merchant.first + # + # post '/auth/developer/callback', params: { + # name: fake_user.username, + # email: fake_user.email + # } + # assert_not_nil @response.cookies[Rails.application.config.session_options[:key]] + # assert_equal merchant.id, session[:merchant_id] + # assert_redirected_to root_path + # end + + # describe "login" do + # it "allows a new merchant to log in" do + # username = "username" + # + # Merchant.find_by(username: username).must_be_nil + # # should find no merchant with this username + # + # post login_path, params: { username: username } + # # do the actions defined in sessions#create (as defined in routes for login_path) using the information defined in username: username (in this case, username: username) + # + # must_redirect_to root_path + # end + # + # it "creates " do + # skip + # end + # + # it "allows a returning user to log in" do + # Merchant.create(username: 'finn', email: 'puppies@kittens.com') + # # creates a new merchant in the db + # username = Merchant.first.username + # # this sets the username as the first existing merchant (that already exists) + # + # post login_path, params: { username: username } + # # (same as test one) + # # do the actions defined in sessions#create (as defined in routes for login_path) using the information defined in username: username (in this case, a returning user) + # + # must_redirect_to root_path + # end + # + # it "renders bad_request if the username entered is blank" do + # post login_path, params: { username: "" } + # + # must_respond_with :bad_request + # end + # + # it "renders bad_request if a merchant is already logged in" do + # skip + # end + # end + # + # describe "logout" do + # it "succeeds if the user is logged in" do + # skip + # # Gotta be logged in first + # post login_path, params: { username: "test user" } + # must_redirect_to root_path + # + # post logout_path + # must_redirect_to root_path + # end + # + # it "succeeds if the user is not logged in" do + # post logout_path + # must_redirect_to root_path + # end + # end + # end +end diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/fixtures/billings.yml b/test/fixtures/billings.yml new file mode 100644 index 0000000000..2dae520c50 --- /dev/null +++ b/test/fixtures/billings.yml @@ -0,0 +1,17 @@ +# # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html +# + +one: + name: Finn Dog + street: 1313 Puppy Lane + apt: Apt 13 + city: Seattle + state: WA + ship_zip: 98101 + email: finn.dog@gmail.com + credit_card: "1111222233334444" + exp: 0120 + cvv: 123 + bill_zip: 98101 + +# # diff --git a/test/fixtures/categories.yml b/test/fixtures/categories.yml new file mode 100644 index 0000000000..f626324429 --- /dev/null +++ b/test/fixtures/categories.yml @@ -0,0 +1,14 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + + +cat_one: + id: 1 + category_name: Dinner + +cat_two: + id: 2 + category_name: Breakfast + +cat_three: + id: 20 + category_name: Empty diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/fixtures/merchants.yml b/test/fixtures/merchants.yml new file mode 100644 index 0000000000..e3ac419cd0 --- /dev/null +++ b/test/fixtures/merchants.yml @@ -0,0 +1,19 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# + + +fake_user: + username: amy + email: blah@123.com + uid: a_uid + provider: github + +fake_user2: + username: angela + email: blah@123.com + uid: b_uid + provider: github diff --git a/test/fixtures/order_products.yml b/test/fixtures/order_products.yml new file mode 100644 index 0000000000..b9c40e9326 --- /dev/null +++ b/test/fixtures/order_products.yml @@ -0,0 +1,20 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +op_one: + quantity: 1 + product: fake_product1 + order: one + +op_two: + quantity: 1 + product: fake_product2 + order: one + +op_three: + quantity: 2 + product: fake_product2 + +op_four: + quantity: 1 + order_id: 1 + product_id: 1 diff --git a/test/fixtures/orders.yml b/test/fixtures/orders.yml new file mode 100644 index 0000000000..309a7b8216 --- /dev/null +++ b/test/fixtures/orders.yml @@ -0,0 +1,7 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + status: pending + +two: + status: MyString diff --git a/test/fixtures/products.yml b/test/fixtures/products.yml new file mode 100644 index 0000000000..5d83a69cae --- /dev/null +++ b/test/fixtures/products.yml @@ -0,0 +1,17 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +fake_product1: + name: MyString + description: MyString + price: 1 + stock: 3 + category_id: 1 + merchant_id: 1 + +fake_product2: + name: MyString + description: MyString + price: 1 + stock: 1 + category_id: 2 + merchant_id: 2 diff --git a/test/fixtures/reviews.yml b/test/fixtures/reviews.yml new file mode 100644 index 0000000000..b06217e9fc --- /dev/null +++ b/test/fixtures/reviews.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + product_id: 1 + rating: 1 + reviewtext: MyString + +two: + product_id: 1 + rating: 1 + reviewtext: MyString diff --git a/test/helpers/.keep b/test/helpers/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/models/billing_test.rb b/test/models/billing_test.rb new file mode 100644 index 0000000000..2bf80429d1 --- /dev/null +++ b/test/models/billing_test.rb @@ -0,0 +1,85 @@ +require "test_helper" + +describe Billing do + before do + @billing = billings(:one) + end #before billing + + describe 'validate' do + it "can be created and required fields cannot be nil" do + @billing.must_be_kind_of Billing + refute_nil @billing.id + refute_nil @billing.name + refute_nil @billing.street + refute_nil @billing.apt + refute_nil @billing.city + refute_nil @billing.state + refute_nil @billing.ship_zip + refute_nil @billing.email + refute_nil @billing.credit_card + refute_nil @billing.exp + refute_nil @billing.cvv + refute_nil @billing.bill_zip + end #can be created + + it "is invalid if any required fields are missing" do + @billing.name = nil + @billing.valid?.must_equal false + + @billing.street = nil + @billing.valid?.must_equal false + + @billing.city = nil + @billing.valid?.must_equal false + + @billing.state = nil + @billing.valid?.must_equal false + + @billing.ship_zip = nil + @billing.valid?.must_equal false + + @billing.email = nil + @billing.valid?.must_equal false + + @billing.credit_card = nil + @billing.valid?.must_equal false + + @billing.exp = nil + @billing.valid?.must_equal false + + @billing.cvv = nil + @billing.valid?.must_equal false + + @billing.bill_zip = nil + @billing.valid?.must_equal false + end #presence validation + + it "ship_zip must be 5 characters" do + @billing.ship_zip = 123 + @billing.valid?.must_equal false + @billing.errors.messages.must_include :ship_zip + + @billing.ship_zip = 12345 + @billing.valid?.must_equal true + end #ship_zip + + it "bill_zip must be 5 characters" do + @billing.bill_zip = 123 + @billing.valid?.must_equal false + @billing.errors.messages.must_include :bill_zip + + @billing.bill_zip = 12345 + @billing.valid?.must_equal true + end #bill zip + + it "Credit card number must be 16 characters" do + @billing.credit_card = 123456789123456 + @billing.valid?.must_equal false + @billing.errors.messages.must_include :credit_card + + @billing.credit_card = 1234567891234567 + @billing.valid?.must_equal true + end #credit card + end #all validations + +end #all diff --git a/test/models/category_test.rb b/test/models/category_test.rb new file mode 100644 index 0000000000..f505312224 --- /dev/null +++ b/test/models/category_test.rb @@ -0,0 +1,39 @@ +require "test_helper" +# + +describe Category do + let(:category) { Category.new } + + words = "a" * 30 + long = "a" * 31 + + it "can be created with required fields" do + b = Category.new(category_name: "Category") + b.must_be :valid? + end #can be created + + it "requires a name" do + b = Category.new(category_name: "") + b.wont_be :valid? + b.errors.messages.must_include :category_name + end #requires a name + + it "requires a unique name" do + name = "test name" + b1 = Category.create!(category_name: name) + b2 = Category.new(category_name: name) + + b2.wont_be :valid? + end #unique name + + it "will allow a name up to 30 characters" do + b = Category.new(category_name: words) + b.must_be :valid? + end + + it "will not accept a name over 30 characters" do + b = Category.new(category_name: long) + b.wont_be :valid? + b.errors.messages.must_include :category_name + end +end diff --git a/test/models/merchant_test.rb b/test/models/merchant_test.rb new file mode 100644 index 0000000000..ff5d77d7f6 --- /dev/null +++ b/test/models/merchant_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +# describe Merchant do +# let(:merchant) { Merchant.new } +# +# it "must be valid" do +# value(merchant).must_be :valid? +# end +# end diff --git a/test/models/order_product_test.rb b/test/models/order_product_test.rb new file mode 100644 index 0000000000..4813f6410d --- /dev/null +++ b/test/models/order_product_test.rb @@ -0,0 +1,19 @@ +require "test_helper" + +describe OrderProduct do + + before do + @order_product = order_products(:op_four) + end + + describe "associations" do + it "responds to order" do + @order_product.must_respond_to :order + end + + it "responds to order" do + @order_product.must_respond_to :product + end + end + +end diff --git a/test/models/order_test.rb b/test/models/order_test.rb new file mode 100644 index 0000000000..9e5f762088 --- /dev/null +++ b/test/models/order_test.rb @@ -0,0 +1,108 @@ +require "test_helper" + +describe Order do + let(:order) { Order.new } + + describe "validations" do + ## no validations currently + end + + describe "associations" do + it "responds to order_product" do + order = Order.first + order.must_respond_to :order_products + end + + it "responds to product" do + order = Order.first + order.must_respond_to :products + end + end + + describe "start new order method" do + it "can be created" do + start_order_count = Order.count + Order.start_new_order + Order.count.must_equal start_order_count + 1 + end + + it "is created with a 'pending' status" do + order = Order.start_new_order + order.status.must_equal "pending" + end + end + + describe "find or create cart method" do + it "Successfully finds order if order is in session" do + new_order = Order.start_new_order + order_id = new_order.id + order = Order.find_or_create_cart(order_id) + order.id.must_equal order_id + end + it "Creates a new order if no order exist" do + order_id = order.id + start_order_count = Order.count + Order.find_or_create_cart(order_id) + Order.count.must_equal start_order_count + 1 + end + end + + describe "subtract_products" do + it "returns true when the database is updated" do + product1 = products(:fake_product1) + product2 = products(:fake_product2) + + op1 = order_products(:op_one) + op2 = order_products(:op_two) + + # order = Order.create!( + # status: "pending" + # ) + + op1.order = order + op1.save! + op2.order = order + op2.save! + + + + order.subtract_products.must_equal true + # use reload when the database has changed and the local variable goes stale e.g. subtract_products updates the database and product1 was not updated. + expected_stock = product1.stock - op1.quantity + product1.reload + product1.stock.must_equal expected_stock + + expected_stock = product2.stock - op2.quantity + product2.reload + product2.stock.must_equal expected_stock + + end + + it "returns false when the database is not updated for any reason" do + # step 1 (set up for the test) + + product1 = products(:fake_product1) + product2 = products(:fake_product2) + + op1 = order_products(:op_one) + op2 = order_products(:op_three) + + op1.order = order + op1.save! + op2.order = order + op2.save! + + order.subtract_products.must_equal false + + expected_stock = product1.stock + product1.reload + product1.stock.must_equal expected_stock + + + expected_stock = product2.stock + product2.reload + product2.stock.must_equal expected_stock + + end + end +end diff --git a/test/models/product_test.rb b/test/models/product_test.rb new file mode 100644 index 0000000000..8b7f1e1839 --- /dev/null +++ b/test/models/product_test.rb @@ -0,0 +1,93 @@ +require "test_helper" + +describe Product do + before do + @product = products(:fake_product1) + end + + describe 'relationships' do + it "responds to merchant" do + @product.must_respond_to :merchant + end + + it "responds to category" do + @product.must_respond_to :category + end + + it "responds to order_products" do + @product.must_respond_to :order_products + end + + it "responds to order" do + @product.must_respond_to :orders + end + + it "responds to reviews" do + @product.must_respond_to :reviews + end + # ========================= # + it "has a merchant" do + @product.merchant.id.must_equal 1 + @product.merchant.must_equal merchants(:fake_user) + @product.merchant_id.must_equal merchants(:fake_user).id + end + + it "has a category" do + @product.category.id.must_equal 1 + @product.category.must_equal categories(:cat_one) + @product.category_id.must_equal categories(:cat_one).id + end + end + + describe 'validate' do + it "can be created and required fields cannot be nil" do + @product.must_be_kind_of Product + + refute_nil @product.id + refute_nil @product.name + refute_nil @product.price + refute_nil @product.stock + refute_nil @product.merchant_id + refute_nil @product.category_id + end + + it "is invalid if any required fields are missing" do + @product.name = nil + @product.valid?.must_equal false + + @product.price = nil + @product.valid?.must_equal false + + @product.stock = nil + @product.valid?.must_equal false + + @product.merchant_id = nil + @product.valid?.must_equal false + + @product.category_id = nil + @product.valid?.must_equal false + end + + it "requires price to be an integer greater than 0" do + @product.price = -1 + @product.valid?.must_equal false + @product.errors.messages.must_include :price + + @product.price = 0 + @product.valid?.must_equal false + @product.errors.messages.must_include :price + + @product.price = 1 + @product.valid?.must_equal true + end + + it "requires stock to be greater than or equal to 0" do + @product.stock = -1 + @product.valid?.must_equal false + @product.errors.messages.must_include :stock + + @product.stock = 0 + @product.valid?.must_equal true + end + end +end diff --git a/test/models/review_test.rb b/test/models/review_test.rb new file mode 100644 index 0000000000..753c76d4d6 --- /dev/null +++ b/test/models/review_test.rb @@ -0,0 +1,32 @@ +require "test_helper" + + +describe Review do + let(:review) { Review.new } + + words = "a" * 500 + long = "a" * 501 + + it "can be created with required fields" do + b = Review.new(rating: 1, product_id: Product.first.id) + b.must_be :valid? + end #can be created + + it "can only take an integer between 1 and 5 as a rating" do + b = Review.new(rating: 10, product_id: Product.first.id) + b.wont_be :valid? + b.errors.messages.must_include :rating + end + + it "will allow a text review up to 500 characters" do + b = Review.new(rating: 1, product_id: Product.first.id, reviewtext: words) + b.must_be :valid? + end + + it "will not accept a text review over 500 characters" do + b = Review.new(rating: 1, product_id: Product.first.id, reviewtext: long) + b.wont_be :valid? + b.errors.messages.must_include :reviewtext + end + +end diff --git a/test/system/.keep b/test/system/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 0000000000..26ceaa0115 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,47 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails" +require "minitest/reporters" # for Colorized output +require 'simplecov' +SimpleCov.start + +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... + def setup + OmniAuth.config.test_mode = true + end + + def mock_auth_hash(merchant) + return { + provider: merchant.provider, + uid: merchant.uid, + info: { + email: merchant.email, + nickname: merchant.username + } + } + end + + def login(merchant) + OmniAuth.config.mock_auth[:github] = OmniAuth::AuthHash.new(mock_auth_hash(merchant)) + get auth_callback_path(:github) + end +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 0000000000..e69de29bb2