diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..e42ad14d78 --- /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 +.DS_store + +coverage +.env diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000000..3c10a3b126 --- /dev/null +++ b/Gemfile @@ -0,0 +1,78 @@ +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 + +gem "omniauth" +gem "omniauth-github" +gem 'simplecov', require: false, group: :test + +gem 'faker', :git => 'https://github.com/stympy/faker.git', :branch => 'master' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.1.6' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# 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', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# 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 + # 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' +gem 'jquery-rails' +gem 'foundation-rails' +gem 'normalize-rails' +group :development, :test do + gem 'pry-rails' +end + +group :development do + gem 'better_errors' + gem 'binding_of_caller' + gem 'dotenv-rails' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000000..8ab4a91a69 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,281 @@ +GIT + remote: https://github.com/stympy/faker.git + revision: f8e1b81f8da82ea9eb88c4939a3a6801f97e5ac1 + branch: master + specs: + faker (1.8.7) + i18n (>= 0.7) + +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.1.6) + actionpack (= 5.1.6) + nio4r (~> 2.0) + websocket-driver (~> 0.6.1) + actionmailer (5.1.6) + actionpack (= 5.1.6) + actionview (= 5.1.6) + activejob (= 5.1.6) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.1.6) + actionview (= 5.1.6) + activesupport (= 5.1.6) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.1.6) + activesupport (= 5.1.6) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.1.6) + activesupport (= 5.1.6) + globalid (>= 0.3.6) + activemodel (5.1.6) + activesupport (= 5.1.6) + activerecord (5.1.6) + activemodel (= 5.1.6) + activesupport (= 5.1.6) + arel (~> 8.0) + activesupport (5.1.6) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + ansi (1.5.0) + 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.8.0) + debug_inspector (>= 0.0.1) + builder (3.2.3) + byebug (10.0.2) + capybara (2.18.0) + addressable + mini_mime (>= 0.1.3) + nokogiri (>= 1.3.3) + rack (>= 1.0.0) + rack-test (>= 0.5.4) + xpath (>= 2.0, < 4.0) + childprocess (0.9.0) + ffi (~> 1.0, >= 1.0.11) + coderay (1.1.2) + concurrent-ruby (1.0.5) + crass (1.0.4) + debug_inspector (0.0.3) + docile (1.1.5) + dotenv (2.2.2) + dotenv-rails (2.2.2) + dotenv (= 2.2.2) + railties (>= 3.2, < 6.0) + erubi (1.7.1) + execjs (2.7.0) + faraday (0.12.2) + multipart-post (>= 1.2, < 3) + ffi (1.9.23) + foundation-rails (6.4.3.0) + railties (>= 3.1.0) + sass (>= 3.3.0, < 3.5) + sprockets-es6 (>= 0.9.0) + globalid (0.4.1) + activesupport (>= 4.2.0) + hashie (3.5.7) + i18n (1.0.1) + concurrent-ruby (~> 1.0) + jbuilder (2.7.0) + activesupport (>= 4.2.0) + multi_json (>= 1.2) + jquery-rails (4.3.3) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + jquery-turbolinks (2.1.0) + railties (>= 3.1.0) + turbolinks + 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.2.2) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.0) + mini_mime (>= 0.1.1) + method_source (0.9.0) + mini_mime (1.0.0) + mini_portile2 (2.3.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.2.0) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + multi_json (1.13.1) + multi_xml (0.6.0) + multipart-post (2.0.0) + nio4r (2.3.0) + nokogiri (1.8.2) + mini_portile2 (~> 2.3.0) + normalize-rails (4.1.1) + 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.8.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.5.0) + oauth2 (~> 1.1) + omniauth (~> 1.2) + pg (1.0.0) + pry (0.11.3) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.6) + pry (>= 0.10.4) + public_suffix (3.0.2) + puma (3.11.4) + rack (2.0.4) + rack-test (1.0.0) + rack (>= 1.0, < 3) + rails (5.1.6) + actioncable (= 5.1.6) + actionmailer (= 5.1.6) + actionpack (= 5.1.6) + actionview (= 5.1.6) + activejob (= 5.1.6) + activemodel (= 5.1.6) + activerecord (= 5.1.6) + activesupport (= 5.1.6) + bundler (>= 1.3.0) + railties (= 5.1.6) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.1.6) + actionpack (= 5.1.6) + activesupport (= 5.1.6) + method_source + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (12.3.1) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + ruby-progressbar (1.9.0) + ruby_dep (1.5.0) + rubyzip (1.2.1) + sass (3.4.25) + sass-rails (5.0.7) + railties (>= 4.0.0, < 6) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + selenium-webdriver (3.11.0) + childprocess (~> 0.5) + rubyzip (~> 1.2) + 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.1.1) + turbolinks-source (~> 5.1) + turbolinks-source (5.1.0) + tzinfo (1.2.5) + thread_safe (~> 0.1) + uglifier (4.1.9) + execjs (>= 0.3.0, < 3) + web-console (3.6.0) + 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.3) + xpath (3.0.0) + nokogiri (~> 1.8) + +PLATFORMS + ruby + +DEPENDENCIES + better_errors + binding_of_caller + byebug + capybara (~> 2.13) + dotenv-rails + faker! + foundation-rails + jbuilder (~> 2.5) + jquery-rails + jquery-turbolinks + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + normalize-rails + omniauth + omniauth-github + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.7) + rails (~> 5.1.6) + 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.1 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/ampers-petsy-app b/ampers-petsy-app new file mode 160000 index 0000000000..3c1b6be677 --- /dev/null +++ b/ampers-petsy-app @@ -0,0 +1 @@ +Subproject commit 3c1b6be677d9609c4838a9df34d11ccc07fc176a 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..f04673be81 --- /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 jquery + +// +//= 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/order_items.js b/app/assets/javascripts/order_items.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/order_items.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/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/javascripts/users.js b/app/assets/javascripts/users.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/users.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css new file mode 100644 index 0000000000..e9637c2c59 --- /dev/null +++ b/app/assets/stylesheets/application.css @@ -0,0 +1,43 @@ +/* + * This is a manifest file that'll be compiled into application.css, which will include all the files + * listed below. + * + * Any CSS and SCSS file within this directory, lib/assets/stylesheets, or any plugin's + * vendor/assets/stylesheets directory can be referenced here using a relative path. + * + * You're free to add application-wide styles to this file and they'll appear at the bottom of the + * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS + * files in this directory. Styles in this file should be added after the last require_* statement. + * It is generally better to create a new file per style scope. + *= require normalize-rails + * + *= require_self + *= require main + */ + + /* Merchant Show Page */ + +.gray-box { + border: solid #e6e6e6 1px; + padding: 1em; + margin: 1em; +} + +.merchant-area ul li { + list-style-type: none; +} + +.merchant-new { + padding-top: 10em; + text-align: center; +} + +.merchant-new .button { + background-color: #D64933; +} + +/* Order Confirmation Page */ + +.order-contact { + text-align: center; +} diff --git a/app/assets/stylesheets/base/_settings.scss b/app/assets/stylesheets/base/_settings.scss new file mode 100644 index 0000000000..8f0d4edf64 --- /dev/null +++ b/app/assets/stylesheets/base/_settings.scss @@ -0,0 +1,868 @@ +// 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: 'Merriweather', Helvetica, Roboto, Arial, sans-serif; +$body-antialiased: true; +$global-margin: 1rem; +$global-padding: 1rem; +$global-position: 1rem; +$global-weight-normal: normal; +$global-weight-bold: bold; +$global-radius: 0; +$global-menu-padding: 0.7rem 1rem; +$global-menu-nested-margin: 1rem; +$global-text-direction: ltr; +$global-flexbox: true; +$global-prototype-breakpoints: false; +$global-button-cursor: auto; +$global-color-pick-contrast-tolerance: 0; +$print-transparent-backgrounds: true; + +@include add-foundation-colors; + +// 2. Breakpoints +// -------------- + +$breakpoints: ( + small: 0, + medium: 640px, + large: 1024px, + xlarge: 1200px, + xxlarge: 1440px, +); +$print-breakpoint: large; +$breakpoint-classes: (small medium large); + +// 3. The Grid +// ----------- + +$grid-row-width: $global-width; +$grid-column-count: 12; +$grid-column-gutter: ( + small: 20px, + medium: 30px, +); +$grid-column-align-edge: true; +$grid-column-alias: 'columns'; +$block-grid-max: 8; + +// 4. Base Typography +// ------------------ + +$header-font-family: $body-font-family; +$header-font-weight: $global-weight-normal; +$header-font-style: normal; +$font-family-monospace: Consolas, 'Liberation Mono', Courier, monospace; +$header-color: inherit; +$header-lineheight: 1.4; +$header-margin-bottom: 0.5rem; +$header-styles: ( + small: ( + 'h1': ('font-size': 24), + 'h2': ('font-size': 20), + 'h3': ('font-size': 19), + 'h4': ('font-size': 18), + 'h5': ('font-size': 17), + 'h6': ('font-size': 16), + ), + medium: ( + 'h1': ('font-size': 48), + 'h2': ('font-size': 40), + 'h3': ('font-size': 31), + 'h4': ('font-size': 25), + 'h5': ('font-size': 20), + 'h6': ('font-size': 16), + ), +); +$header-text-rendering: optimizeLegibility; +$small-font-size: 80%; +$header-small-font-color: $medium-gray; +$paragraph-lineheight: 1.6; +$paragraph-margin-bottom: 1rem; +$paragraph-text-rendering: optimizeLegibility; +$code-color: $black; +$code-font-family: $font-family-monospace; +$code-font-weight: $global-weight-normal; +$code-background: $light-gray; +$code-border: 1px solid $medium-gray; +$code-padding: rem-calc(2 5 1); +$anchor-color: $primary-color; +$anchor-color-hover: scale-color($anchor-color, $lightness: -14%); +$anchor-text-decoration: none; +$anchor-text-decoration-hover: none; +$hr-width: $global-width; +$hr-border: 1px solid $medium-gray; +$hr-margin: rem-calc(20) auto; +$list-lineheight: $paragraph-lineheight; +$list-margin-bottom: $paragraph-margin-bottom; +$list-style-type: disc; +$list-style-position: outside; +$list-side-margin: 1.25rem; +$list-nested-side-margin: 1.25rem; +$defnlist-margin-bottom: 1rem; +$defnlist-term-weight: $global-weight-bold; +$defnlist-term-margin-bottom: 0.3rem; +$blockquote-color: $dark-gray; +$blockquote-padding: rem-calc(9 20 0 19); +$blockquote-border: 1px solid $medium-gray; +$cite-font-size: rem-calc(13); +$cite-color: $dark-gray; +$cite-pseudo-content: '\2014 \0020'; +$keystroke-font: $font-family-monospace; +$keystroke-color: $black; +$keystroke-background: $light-gray; +$keystroke-padding: rem-calc(2 4 0); +$keystroke-radius: $global-radius; +$abbr-underline: 1px dotted $black; + +// 5. Typography Helpers +// --------------------- + +$lead-font-size: $global-font-size * 1.25; +$lead-lineheight: 1.6; +$subheader-lineheight: 1.4; +$subheader-color: $dark-gray; +$subheader-font-weight: $global-weight-normal; +$subheader-margin-top: 0.2rem; +$subheader-margin-bottom: 0.5rem; +$stat-font-size: 2.5rem; + +// 6. Abide +// -------- + +$abide-inputs: true; +$abide-labels: true; +$input-background-invalid: get-color(alert); +$form-label-color-invalid: get-color(alert); +$input-error-color: get-color(alert); +$input-error-font-size: rem-calc(12); +$input-error-font-weight: $global-weight-bold; + +// 7. Accordion +// ------------ + +$accordion-background: $white; +$accordion-plusminus: true; +$accordion-title-font-size: rem-calc(12); +$accordion-item-color: $primary-color; +$accordion-item-background-hover: $light-gray; +$accordion-item-padding: 1.25rem 1rem; +$accordion-content-background: $white; +$accordion-content-border: 1px solid $light-gray; +$accordion-content-color: $body-font-color; +$accordion-content-padding: 1rem; + +// 8. Accordion Menu +// ----------------- + +$accordionmenu-padding: $global-menu-padding; +$accordionmenu-nested-margin: $global-menu-nested-margin; +$accordionmenu-submenu-padding: $accordionmenu-padding; +$accordionmenu-arrows: true; +$accordionmenu-arrow-color: $primary-color; +$accordionmenu-item-background: null; +$accordionmenu-border: null; +$accordionmenu-submenu-toggle-background: null; +$accordion-submenu-toggle-border: $accordionmenu-border; +$accordionmenu-submenu-toggle-width: 40px; +$accordionmenu-submenu-toggle-height: $accordionmenu-submenu-toggle-width; +$accordionmenu-arrow-size: 6px; + +// 9. Badge +// -------- + +$badge-background: $primary-color; +$badge-color: $white; +$badge-color-alt: $black; +$badge-palette: $foundation-palette; +$badge-padding: 0.3em; +$badge-minwidth: 2.1em; +$badge-font-size: 0.6rem; + +// 10. Breadcrumbs +// --------------- + +$breadcrumbs-margin: 0 0 $global-margin 0; +$breadcrumbs-item-font-size: rem-calc(11); +$breadcrumbs-item-color: $primary-color; +$breadcrumbs-item-color-current: $black; +$breadcrumbs-item-color-disabled: $medium-gray; +$breadcrumbs-item-margin: 0.75rem; +$breadcrumbs-item-uppercase: true; +$breadcrumbs-item-separator: true; +$breadcrumbs-item-separator-item: '/'; +$breadcrumbs-item-separator-item-rtl: '\\'; +$breadcrumbs-item-separator-color: $medium-gray; + +// 11. Button +// ---------- + +$button-font-family: inherit; +$button-padding: 0.85em 1em; +$button-margin: 0 0 $global-margin 0; +$button-fill: solid; +$button-background: $primary-color; +$button-background-hover: scale-color($button-background, $lightness: -15%); +$button-color: $white; +$button-color-alt: $black; +$button-radius: $global-radius; +$button-hollow-border-width: 1px; +$button-sizes: ( + tiny: 0.6rem, + small: 0.75rem, + default: 0.9rem, + large: 1.25rem, +); +$button-palette: $foundation-palette; +$button-opacity-disabled: 0.25; +$button-background-hover-lightness: -20%; +$button-hollow-hover-lightness: -50%; +$button-transition: background-color 0.25s ease-out, color 0.25s ease-out; + +// 12. Button Group +// ---------------- + +$buttongroup-margin: 1rem; +$buttongroup-spacing: 1px; +$buttongroup-child-selector: '.button'; +$buttongroup-expand-max: 6; +$buttongroup-radius-on-each: true; + +// 13. Callout +// ----------- + +$callout-background: $white; +$callout-background-fade: 85%; +$callout-border: 1px solid rgba($black, 0.25); +$callout-margin: 0 0 1rem 0; +$callout-padding: 1rem; +$callout-font-color: $body-font-color; +$callout-font-color-alt: $body-background; +$callout-radius: $global-radius; +$callout-link-tint: 30%; + +// 14. Card +// -------- + +$card-background: $white; +$card-font-color: $body-font-color; +$card-divider-background: $light-gray; +$card-border: 1px solid $light-gray; +$card-shadow: none; +$card-border-radius: $global-radius; +$card-padding: $global-padding; +$card-margin-bottom: $global-margin; + +// 15. Close Button +// ---------------- + +$closebutton-position: right top; +$closebutton-offset-horizontal: ( + small: 0.66rem, + medium: 1rem, +); +$closebutton-offset-vertical: ( + small: 0.33em, + medium: 0.5rem, +); +$closebutton-size: ( + small: 1.5em, + medium: 2em, +); +$closebutton-lineheight: 1; +$closebutton-color: $dark-gray; +$closebutton-color-hover: $black; + +// 16. Drilldown +// ------------- + +$drilldown-transition: transform 0.15s linear; +$drilldown-arrows: true; +$drilldown-padding: $global-menu-padding; +$drilldown-nested-margin: 0; +$drilldown-background: $white; +$drilldown-submenu-padding: $drilldown-padding; +$drilldown-submenu-background: $white; +$drilldown-arrow-color: $primary-color; +$drilldown-arrow-size: 6px; + +// 17. Dropdown +// ------------ + +$dropdown-padding: 1rem; +$dropdown-background: $body-background; +$dropdown-border: 1px solid $medium-gray; +$dropdown-font-size: 1rem; +$dropdown-width: 300px; +$dropdown-radius: $global-radius; +$dropdown-sizes: ( + tiny: 100px, + small: 200px, + large: 400px, +); + +// 18. Dropdown Menu +// ----------------- + +$dropdownmenu-arrows: true; +$dropdownmenu-arrow-color: $anchor-color; +$dropdownmenu-arrow-size: 6px; +$dropdownmenu-arrow-padding: 1.5rem; +$dropdownmenu-min-width: 200px; +$dropdownmenu-background: $white; +$dropdownmenu-submenu-background: $dropdownmenu-background; +$dropdownmenu-padding: $global-menu-padding; +$dropdownmenu-nested-margin: 0; +$dropdownmenu-submenu-padding: $dropdownmenu-padding; +$dropdownmenu-border: 1px solid $medium-gray; +$dropdown-menu-item-color-active: get-color(primary); +$dropdown-menu-item-background-active: transparent; + +// 19. Flexbox Utilities +// --------------------- + +$flex-source-ordering-count: 6; +$flexbox-responsive-breakpoints: true; + +// 20. Forms +// --------- + +$fieldset-border: 1px solid $medium-gray; +$fieldset-padding: rem-calc(20); +$fieldset-margin: rem-calc(18 0); +$legend-padding: rem-calc(0 3); +$form-spacing: rem-calc(16); +$helptext-color: $black; +$helptext-font-size: rem-calc(13); +$helptext-font-style: italic; +$input-prefix-color: $black; +$input-prefix-background: $light-gray; +$input-prefix-border: 1px solid $medium-gray; +$input-prefix-padding: 1rem; +$form-label-color: $black; +$form-label-font-size: rem-calc(14); +$form-label-font-weight: $global-weight-normal; +$form-label-line-height: 1.8; +$select-background: $white; +$select-triangle-color: $dark-gray; +$select-radius: $global-radius; +$input-color: $black; +$input-placeholder-color: $medium-gray; +$input-font-family: inherit; +$input-font-size: rem-calc(16); +$input-font-weight: $global-weight-normal; +$input-line-height: $global-lineheight; +$input-background: $white; +$input-background-focus: $white; +$input-background-disabled: $light-gray; +$input-border: 1px solid $medium-gray; +$input-border-focus: 1px solid $dark-gray; +$input-padding: $form-spacing / 2; +$input-shadow: inset 0 1px 2px rgba($black, 0.1); +$input-shadow-focus: 0 0 5px $medium-gray; +$input-cursor-disabled: not-allowed; +$input-transition: box-shadow 0.5s, border-color 0.25s ease-in-out; +$input-number-spinners: true; +$input-radius: $global-radius; +$form-button-radius: $global-radius; + +// 21. Label +// --------- + +$label-background: $primary-color; +$label-color: $white; +$label-color-alt: $black; +$label-palette: $foundation-palette; +$label-font-size: 0.8rem; +$label-padding: 0.33333rem 0.5rem; +$label-radius: $global-radius; + +// 22. Media Object +// ---------------- + +$mediaobject-margin-bottom: $global-margin; +$mediaobject-section-padding: $global-padding; +$mediaobject-image-width-stacked: 100%; + +// 23. Menu +// -------- + +$menu-margin: 0; +$menu-nested-margin: $global-menu-nested-margin; +$menu-items-padding: $global-menu-padding; +$menu-simple-margin: 1rem; +$menu-item-color-active: $white; +$menu-item-background-active: get-color(primary); +$menu-icon-spacing: 0.25rem; +$menu-item-background-hover: $light-gray; +$menu-state-back-compat: true; +$menu-centered-back-compat: true; +$menu-icons-back-compat: true; + +// 24. Meter +// --------- + +$meter-height: 1rem; +$meter-radius: $global-radius; +$meter-background: $medium-gray; +$meter-fill-good: $success-color; +$meter-fill-medium: $warning-color; +$meter-fill-bad: $alert-color; + +// 25. Off-canvas +// -------------- + +$offcanvas-sizes: ( + small: 250px, +); +$offcanvas-vertical-sizes: ( + small: 250px, +); +$offcanvas-background: $light-gray; +$offcanvas-shadow: 0 0 10px rgba($black, 0.7); +$offcanvas-inner-shadow-size: 20px; +$offcanvas-inner-shadow-color: rgba($black, 0.25); +$offcanvas-overlay-zindex: 11; +$offcanvas-push-zindex: 12; +$offcanvas-overlap-zindex: 13; +$offcanvas-reveal-zindex: 12; +$offcanvas-transition-length: 0.5s; +$offcanvas-transition-timing: ease; +$offcanvas-fixed-reveal: true; +$offcanvas-exit-background: rgba($white, 0.25); +$maincontent-class: 'off-canvas-content'; + +// 26. Orbit +// --------- + +$orbit-bullet-background: $medium-gray; +$orbit-bullet-background-active: $dark-gray; +$orbit-bullet-diameter: 1.2rem; +$orbit-bullet-margin: 0.1rem; +$orbit-bullet-margin-top: 0.8rem; +$orbit-bullet-margin-bottom: 0.8rem; +$orbit-caption-background: rgba($black, 0.5); +$orbit-caption-padding: 1rem; +$orbit-control-background-hover: rgba($black, 0.5); +$orbit-control-padding: 1rem; +$orbit-control-zindex: 10; + +// 27. Pagination +// -------------- + +$pagination-font-size: rem-calc(14); +$pagination-margin-bottom: $global-margin; +$pagination-item-color: $black; +$pagination-item-padding: rem-calc(3 10); +$pagination-item-spacing: rem-calc(1); +$pagination-radius: $global-radius; +$pagination-item-background-hover: $light-gray; +$pagination-item-background-current: $primary-color; +$pagination-item-color-current: $white; +$pagination-item-color-disabled: $medium-gray; +$pagination-ellipsis-color: $black; +$pagination-mobile-items: false; +$pagination-mobile-current-item: false; +$pagination-arrows: true; + +// 28. Progress Bar +// ---------------- + +$progress-height: 1rem; +$progress-background: $medium-gray; +$progress-margin-bottom: $global-margin; +$progress-meter-background: $primary-color; +$progress-radius: $global-radius; + +// 29. Prototype Arrow +// ------------------- + +$prototype-arrow-directions: ( + down, + up, + right, + left +); +$prototype-arrow-size: 0.4375rem; +$prototype-arrow-color: $black; + +// 30. Prototype Border-Box +// ------------------------ + +$prototype-border-box-breakpoints: $global-prototype-breakpoints; + +// 31. Prototype Border-None +// ------------------------- + +$prototype-border-none-breakpoints: $global-prototype-breakpoints; + +// 32. Prototype Bordered +// ---------------------- + +$prototype-bordered-breakpoints: $global-prototype-breakpoints; +$prototype-border-width: rem-calc(1); +$prototype-border-type: solid; +$prototype-border-color: $medium-gray; + +// 33. Prototype Display +// --------------------- + +$prototype-display-breakpoints: $global-prototype-breakpoints; +$prototype-display: ( + inline, + inline-block, + block, + table, + table-cell +); + +// 34. Prototype Font-Styling +// -------------------------- + +$prototype-font-breakpoints: $global-prototype-breakpoints; +$prototype-wide-letter-spacing: rem-calc(4); +$prototype-font-normal: $global-weight-normal; +$prototype-font-bold: $global-weight-bold; + +// 35. Prototype List-Style-Type +// ----------------------------- + +$prototype-list-breakpoints: $global-prototype-breakpoints; +$prototype-style-type-unordered: ( + disc, + circle, + square +); +$prototype-style-type-ordered: ( + decimal, + lower-alpha, + lower-latin, + lower-roman, + upper-alpha, + upper-latin, + upper-roman +); + +// 36. Prototype Overflow +// ---------------------- + +$prototype-overflow-breakpoints: $global-prototype-breakpoints; +$prototype-overflow: ( + visible, + hidden, + scroll +); + +// 37. Prototype Position +// ---------------------- + +$prototype-position-breakpoints: $global-prototype-breakpoints; +$prototype-position: ( + static, + relative, + absolute, + fixed +); +$prototype-position-z-index: 975; + +// 38. Prototype Rounded +// --------------------- + +$prototype-rounded-breakpoints: $global-prototype-breakpoints; +$prototype-border-radius: rem-calc(3); + +// 39. Prototype Separator +// ----------------------- + +$prototype-separator-breakpoints: $global-prototype-breakpoints; +$prototype-separator-align: center; +$prototype-separator-height: rem-calc(2); +$prototype-separator-width: 3rem; +$prototype-separator-background: $primary-color; +$prototype-separator-margin-top: $global-margin; + +// 40. Prototype Shadow +// -------------------- + +$prototype-shadow-breakpoints: $global-prototype-breakpoints; +$prototype-box-shadow: 0 2px 5px 0 rgba(0,0,0,.16), + 0 2px 10px 0 rgba(0,0,0,.12); + +// 41. Prototype Sizing +// -------------------- + +$prototype-sizing-breakpoints: $global-prototype-breakpoints; +$prototype-sizing: ( + width, + height +); +$prototype-sizes: ( + 25: 25%, + 50: 50%, + 75: 75%, + 100: 100% +); + +// 42. Prototype Spacing +// --------------------- + +$prototype-spacing-breakpoints: $global-prototype-breakpoints; +$prototype-spacers-count: 3; + +// 43. Prototype Text-Decoration +// ----------------------------- + +$prototype-decoration-breakpoints: $global-prototype-breakpoints; +$prototype-text-decoration: ( + overline, + underline, + line-through, +); + +// 44. Prototype Text-Transformation +// --------------------------------- + +$prototype-transformation-breakpoints: $global-prototype-breakpoints; +$prototype-text-transformation: ( + lowercase, + uppercase, + capitalize +); + +// 45. Prototype Text-Utilities +// ---------------------------- + +$prototype-utilities-breakpoints: $global-prototype-breakpoints; +$prototype-text-overflow: ellipsis; + +// 46. Responsive Embed +// -------------------- + +$responsive-embed-margin-bottom: rem-calc(16); +$responsive-embed-ratios: ( + default: 4 by 3, + widescreen: 16 by 9, +); + +// 47. Reveal +// ---------- + +$reveal-background: $white; +$reveal-width: 600px; +$reveal-max-width: $global-width; +$reveal-padding: $global-padding; +$reveal-border: 1px solid $medium-gray; +$reveal-radius: $global-radius; +$reveal-zindex: 1005; +$reveal-overlay-background: rgba($black, 0.45); + +// 48. Slider +// ---------- + +$slider-width-vertical: 0.5rem; +$slider-transition: all 0.2s ease-in-out; +$slider-height: 0.5rem; +$slider-background: $light-gray; +$slider-fill-background: $medium-gray; +$slider-handle-height: 1.4rem; +$slider-handle-width: 1.4rem; +$slider-handle-background: $primary-color; +$slider-opacity-disabled: 0.25; +$slider-radius: $global-radius; + +// 49. Switch +// ---------- + +$switch-background: $medium-gray; +$switch-background-active: $primary-color; +$switch-height: 2rem; +$switch-height-tiny: 1.5rem; +$switch-height-small: 1.75rem; +$switch-height-large: 2.5rem; +$switch-radius: $global-radius; +$switch-margin: $global-margin; +$switch-paddle-background: $white; +$switch-paddle-offset: 0.25rem; +$switch-paddle-radius: $global-radius; +$switch-paddle-transition: all 0.25s ease-out; + +// 50. Table +// --------- + +$table-background: $white; +$table-color-scale: 5%; +$table-border: 1px solid smart-scale($table-background, $table-color-scale); +$table-padding: rem-calc(8 10 10); +$table-hover-scale: 2%; +$table-row-hover: darken($table-background, $table-hover-scale); +$table-row-stripe-hover: darken($table-background, $table-color-scale + $table-hover-scale); +$table-is-striped: true; +$table-striped-background: smart-scale($table-background, $table-color-scale); +$table-stripe: even; +$table-head-background: smart-scale($table-background, $table-color-scale / 2); +$table-head-row-hover: darken($table-head-background, $table-hover-scale); +$table-foot-background: smart-scale($table-background, $table-color-scale); +$table-foot-row-hover: darken($table-foot-background, $table-hover-scale); +$table-head-font-color: $body-font-color; +$table-foot-font-color: $body-font-color; +$show-header-for-stacked: false; +$table-stack-breakpoint: medium; + +// 51. Tabs +// -------- + +$tab-margin: 0; +$tab-background: $white; +$tab-color: $primary-color; +$tab-background-active: $light-gray; +$tab-active-color: $primary-color; +$tab-item-font-size: rem-calc(12); +$tab-item-background-hover: $white; +$tab-item-padding: 1.25rem 1.5rem; +$tab-expand-max: 6; +$tab-content-background: $white; +$tab-content-border: $light-gray; +$tab-content-color: $body-font-color; +$tab-content-padding: 1rem; + +// 52. Thumbnail +// ------------- + +$thumbnail-border: solid 4px $white; +$thumbnail-margin-bottom: $global-margin; +$thumbnail-shadow: 0 0 0 1px rgba($black, 0.2); +$thumbnail-shadow-hover: 0 0 6px 1px rgba($primary-color, 0.5); +$thumbnail-transition: box-shadow 200ms ease-out; +$thumbnail-radius: $global-radius; + +// 53. Title Bar +// ------------- + +$titlebar-background: $black; +$titlebar-color: $white; +$titlebar-padding: 0.5rem; +$titlebar-text-font-weight: bold; +$titlebar-icon-color: $white; +$titlebar-icon-color-hover: $medium-gray; +$titlebar-icon-spacing: 0.25rem; + +// 54. Tooltip +// ----------- + +$has-tip-cursor: help; +$has-tip-font-weight: $global-weight-bold; +$has-tip-border-bottom: dotted 1px $dark-gray; +$tooltip-background-color: $black; +$tooltip-color: $white; +$tooltip-padding: 0.75rem; +$tooltip-max-width: 10rem; +$tooltip-font-size: $small-font-size; +$tooltip-pip-width: 0.75rem; +$tooltip-pip-height: $tooltip-pip-width * 0.866; +$tooltip-radius: $global-radius; + +// 55. Top Bar +// ----------- + +$topbar-padding: 0.5rem; +$topbar-background: $light-gray; +$topbar-submenu-background: $topbar-background; +$topbar-title-spacing: 0.5rem 1rem 0.5rem 0; +$topbar-input-width: 200px; +$topbar-unstack-breakpoint: medium; + +// 56. Xy Grid +// ----------- + +$xy-grid: true; +$grid-container: $global-width; +$grid-columns: 12; +$grid-margin-gutters: ( + small: 20px, + medium: 30px +); +$grid-padding-gutters: $grid-margin-gutters; +$grid-container-padding: $grid-padding-gutters; +$grid-container-max: $global-width; +$xy-block-grid-max: 8; diff --git a/app/assets/stylesheets/base/foundation_and_overrides.scss b/app/assets/stylesheets/base/foundation_and_overrides.scss new file mode 100644 index 0000000000..ed4c5a0ecf --- /dev/null +++ b/app/assets/stylesheets/base/foundation_and_overrides.scss @@ -0,0 +1,61 @@ +@charset 'utf-8'; + +@import 'settings'; +@import 'foundation'; + +// If you'd like to include motion-ui the foundation-rails gem comes prepackaged with it, uncomment the 3 @imports, if you are not using the gem you need to install the motion-ui sass package. +// +// @import 'motion-ui/motion-ui'; + +// We include everything by default. To slim your CSS, remove components you don't use. + +@include foundation-global-styles; +@include foundation-xy-grid-classes; +//@include foundation-grid; +//@include foundation-flex-grid; +@include foundation-flex-classes; +@include foundation-typography; +@include foundation-forms; +@include foundation-button; +@include foundation-accordion; +@include foundation-accordion-menu; +@include foundation-badge; +@include foundation-breadcrumbs; +@include foundation-button-group; +@include foundation-callout; +@include foundation-card; +@include foundation-close-button; +@include foundation-menu; +@include foundation-menu-icon; +@include foundation-drilldown-menu; +@include foundation-dropdown; +@include foundation-dropdown-menu; +@include foundation-responsive-embed; +@include foundation-label; +@include foundation-media-object; +@include foundation-off-canvas; +@include foundation-orbit; +@include foundation-pagination; +@include foundation-progress-bar; +@include foundation-slider; +@include foundation-sticky; +@include foundation-reveal; +@include foundation-switch; +@include foundation-table; +@include foundation-tabs; +@include foundation-thumbnail; +@include foundation-title-bar; +@include foundation-tooltip; +@include foundation-top-bar; +@include foundation-visibility-classes; +@include foundation-float-classes; + +// If you'd like to include motion-ui the foundation-rails gem comes prepackaged with it, uncomment the 3 @imports, if you are not using the gem you need to install the motion-ui sass package. +// +// @include motion-ui-transitions; +// @include motion-ui-animations; +@import 'motion-ui/motion-ui'; +@include motion-ui-transitions; +@include motion-ui-animations; + + diff --git a/app/assets/stylesheets/base/normalize.scss b/app/assets/stylesheets/base/normalize.scss new file mode 100644 index 0000000000..47b010e477 --- /dev/null +++ b/app/assets/stylesheets/base/normalize.scss @@ -0,0 +1,341 @@ +/*! normalize.css v8.0.0 | MIT License | github.com/necolas/normalize.css */ + +/* Document + ========================================================================== */ + +/** + * 1. Correct the line height in all browsers. + * 2. Prevent adjustments of font size after orientation changes in iOS. + */ + +html { + line-height: 1.15; /* 1 */ + -webkit-text-size-adjust: 100%; /* 2 */ +} + +/* Sections + ========================================================================== */ + +/** + * Remove the margin in all browsers. + */ + +body { + margin: 0; +} + +/** + * Correct the font size and margin on `h1` elements within `section` and + * `article` contexts in Chrome, Firefox, and Safari. + */ + +h1 { + font-size: 2em; + margin: 0.67em 0; +} + +/* Grouping content + ========================================================================== */ + +/** + * 1. Add the correct box sizing in Firefox. + * 2. Show the overflow in Edge and IE. + */ + +hr { + box-sizing: content-box; /* 1 */ + height: 0; /* 1 */ + overflow: visible; /* 2 */ +} + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +pre { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ +} + +/* Text-level semantics + ========================================================================== */ + +/** + * Remove the gray background on active links in IE 10. + */ + +a { + background-color: transparent; +} + +/** + * 1. Remove the bottom border in Chrome 57- + * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. + */ + +abbr[title] { + border-bottom: none; /* 1 */ + text-decoration: underline; /* 2 */ + text-decoration: underline dotted; /* 2 */ +} + +/** + * Add the correct font weight in Chrome, Edge, and Safari. + */ + +b, +strong { + font-weight: bolder; +} + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +code, +kbd, +samp { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ +} + +/** + * Add the correct font size in all browsers. + */ + +small { + font-size: 80%; +} + +/** + * Prevent `sub` and `sup` elements from affecting the line height in + * all browsers. + */ + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sub { + bottom: -0.25em; +} + +sup { + top: -0.5em; +} + +/* Embedded content + ========================================================================== */ + +/** + * Remove the border on images inside links in IE 10. + */ + +img { + border-style: none; +} + +/* Forms + ========================================================================== */ + +/** + * 1. Change the font styles in all browsers. + * 2. Remove the margin in Firefox and Safari. + */ + +button, +input, +optgroup, +select, +textarea { + font-family: inherit; /* 1 */ + font-size: 100%; /* 1 */ + line-height: 1.15; /* 1 */ + margin: 0; /* 2 */ +} + +/** + * Show the overflow in IE. + * 1. Show the overflow in Edge. + */ + +button, +input { /* 1 */ + overflow: visible; +} + +/** + * Remove the inheritance of text transform in Edge, Firefox, and IE. + * 1. Remove the inheritance of text transform in Firefox. + */ + +button, +select { /* 1 */ + text-transform: none; +} + +/** + * Correct the inability to style clickable types in iOS and Safari. + */ + +button, +[type="button"], +[type="reset"], +[type="submit"] { + -webkit-appearance: button; +} + +/** + * Remove the inner border and padding in Firefox. + */ + +button::-moz-focus-inner, +[type="button"]::-moz-focus-inner, +[type="reset"]::-moz-focus-inner, +[type="submit"]::-moz-focus-inner { + border-style: none; + padding: 0; +} + +/** + * Restore the focus styles unset by the previous rule. + */ + +button:-moz-focusring, +[type="button"]:-moz-focusring, +[type="reset"]:-moz-focusring, +[type="submit"]:-moz-focusring { + outline: 1px dotted ButtonText; +} + +/** + * Correct the padding in Firefox. + */ + +fieldset { + padding: 0.35em 0.75em 0.625em; +} + +/** + * 1. Correct the text wrapping in Edge and IE. + * 2. Correct the color inheritance from `fieldset` elements in IE. + * 3. Remove the padding so developers are not caught out when they zero out + * `fieldset` elements in all browsers. + */ + +legend { + box-sizing: border-box; /* 1 */ + color: inherit; /* 2 */ + display: table; /* 1 */ + max-width: 100%; /* 1 */ + padding: 0; /* 3 */ + white-space: normal; /* 1 */ +} + +/** + * Add the correct vertical alignment in Chrome, Firefox, and Opera. + */ + +progress { + vertical-align: baseline; +} + +/** + * Remove the default vertical scrollbar in IE 10+. + */ + +textarea { + overflow: auto; +} + +/** + * 1. Add the correct box sizing in IE 10. + * 2. Remove the padding in IE 10. + */ + +[type="checkbox"], +[type="radio"] { + box-sizing: border-box; /* 1 */ + padding: 0; /* 2 */ +} + +/** + * Correct the cursor style of increment and decrement buttons in Chrome. + */ + +[type="number"]::-webkit-inner-spin-button, +[type="number"]::-webkit-outer-spin-button { + height: auto; +} + +/** + * 1. Correct the odd appearance in Chrome and Safari. + * 2. Correct the outline style in Safari. + */ + +[type="search"] { + -webkit-appearance: textfield; /* 1 */ + outline-offset: -2px; /* 2 */ +} + +/** + * Remove the inner padding in Chrome and Safari on macOS. + */ + +[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +/** + * 1. Correct the inability to style clickable types in iOS and Safari. + * 2. Change font properties to `inherit` in Safari. + */ + +::-webkit-file-upload-button { + -webkit-appearance: button; /* 1 */ + font: inherit; /* 2 */ +} + +/* Interactive + ========================================================================== */ + +/* + * Add the correct display in Edge, IE 10+, and Firefox. + */ + +details { + display: block; +} + +/* + * Add the correct display in all browsers. + */ + +summary { + display: list-item; +} + +/* Misc + ========================================================================== */ + +/** + * Add the correct display in IE 10+. + */ + +template { + display: none; +} + +/** + * Add the correct display in IE 10. + */ + +[hidden] { + display: none; +} diff --git a/app/assets/stylesheets/browserslist b/app/assets/stylesheets/browserslist new file mode 100644 index 0000000000..6019618a9a --- /dev/null +++ b/app/assets/stylesheets/browserslist @@ -0,0 +1,4 @@ +last 2 versions +ie >= 9 +Android >= 2.3 +ios >= 7 diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss new file mode 100644 index 0000000000..2c6f9ad610 --- /dev/null +++ b/app/assets/stylesheets/main.scss @@ -0,0 +1,13 @@ +@import "base/normalize.scss"; +@import "base/_settings.scss"; +@import "base/foundation_and_overrides.scss"; +@import "styles/categories.scss"; +@import "styles/orders.scss"; +@import "styles/products.scss"; +@import "styles/sessions.scss"; +@import "styles/users.scss"; + +.body-wrapper { + padding: 2%; + overflow: auto; +} diff --git a/app/assets/stylesheets/order_items.scss b/app/assets/stylesheets/order_items.scss new file mode 100644 index 0000000000..4e38cdae9b --- /dev/null +++ b/app/assets/stylesheets/order_items.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the OrderProducts 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/styles/categories.scss b/app/assets/stylesheets/styles/categories.scss new file mode 100644 index 0000000000..4600266056 --- /dev/null +++ b/app/assets/stylesheets/styles/categories.scss @@ -0,0 +1,13 @@ +// 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/ + +.category-nav { + border-top: 2px solid grey; + border-bottom: 2px solid grey; +} + + +@media only screen and (max-width: 768px) { + +} diff --git a/app/assets/stylesheets/styles/orders.scss b/app/assets/stylesheets/styles/orders.scss new file mode 100644 index 0000000000..741506954d --- /dev/null +++ b/app/assets/stylesheets/styles/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/styles/products.scss b/app/assets/stylesheets/styles/products.scss new file mode 100644 index 0000000000..28622451a4 --- /dev/null +++ b/app/assets/stylesheets/styles/products.scss @@ -0,0 +1,103 @@ +// 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/ + +.homepage-cards h4, +.homepage-cards p { + font-family: 'Indie Flower', cursive; +} + +.homepage-card-image { + text-align: center; +} + +.homepage-subtitle { + padding-bottom: 10px; +} + +.site-title, +.site-nav { + display: inline-block; +} + +.site-title{ + float: left; +} + +.site-nav { + text-align: right; + vertical-align: top; + float: right; +} + +#show-page-content { + max-height: 75vh; + overflow: scroll; +} + +.medium-image, .product-info { + display: inline-block; + margin: 0px auto; + max-height: 45vh; + padding: 10px; +} + +// .medium-image, { +// padding-top: 10px; +// } + +// .show-product-view { +// text-align: center; +// } +.product-info .button { + margin: 0px auto; + width: 100%; +} + +.product-info { + vertical-align: top; + // background-color: rgba(255,255,255,0.2); +} + +.show-product-review, .show-product-view { + margin: 0px auto; + text-align: center; + max-width: 60vw; + background-color: rgba(255,255,255,0.8); +} + +.show-product-view { + min-height: 40vh; + margin-top: 3vh; +} + +.show-product-view ul { + text-align: left; +} +#show-review, #product-details { + display: block; + margin: 0px auto 5px auto; +} + +#show-review { + text-align:left; + background-color: white; + padding-left: 10px; + max-height: 15vh; +} + +#show-review li, #product-details li { + color: black; +} + +#reviews { + max-height: 30vh; + overflow: scroll; +} + +#product-details { + max-height: 40vh; + text-align:left; + background-color: transparent; + max-height: 20vh; +} diff --git a/app/assets/stylesheets/styles/reviews.scss b/app/assets/stylesheets/styles/reviews.scss new file mode 100644 index 0000000000..11bbb12cd5 --- /dev/null +++ b/app/assets/stylesheets/styles/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/styles/sessions.scss b/app/assets/stylesheets/styles/sessions.scss new file mode 100644 index 0000000000..ccb1ed25b2 --- /dev/null +++ b/app/assets/stylesheets/styles/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/assets/stylesheets/styles/users.scss b/app/assets/stylesheets/styles/users.scss new file mode 100644 index 0000000000..d40b57c853 --- /dev/null +++ b/app/assets/stylesheets/styles/users.scss @@ -0,0 +1,16 @@ +// Place all the styles related to the Users controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ +div.shop-keepers { + text-align: center; +} + +ul { + text-align: center; + list-style: none; + display: inline; +} + +main { + padding: 50px; +} 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..097d8098dc --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,69 @@ +class ApplicationController < ActionController::Base + protect_from_forgery with: :exception + before_action :find_session + before_action :get_categories + + def get_categories + @categories = Category.all + end + + def render_404 + # DPR: this will actually render a 404 page in production + raise ActionController::RoutingError.new('Not Found') + end + + # if user is logged in, return current_user, else return guest_user + def find_session + find_user + + if @user == nil + if session[:guest_order_id] == nil + new_order = Order.new(status: "pending") + new_order.save + session[:guest_order_id] = new_order.id + end + + else + if Order.find_by(id: session[:user_open_order_id]) + @user + else + @order = Order.new(status: "pending") + @order.save + session[:user_open_order_id] = @order.id + end + + @user + end + end + + def find_user + @user = User.find_by(id: session[:user_id]) + end + + def find_order + if @user + @order = Order.find(session[:user_open_order_id]) + elsif Order.find(session[:guest_order_id]) + @order = Order.find(session[:guest_order_id]) + else + @order = Order.new(id: session[:guest_order_id]) + @order.save + end + + @order + end + + def make_new_order + if @user + new_order = Order.new(status: "pending") + new_order.save + session[:user_open_order_id] = new_order.id + @order = new_order + else + new_order = Order.new(status: "pending") + new_order.save + session[:guest_order_id] = new_order.id + @order = new_order + end + end +end diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb new file mode 100644 index 0000000000..81bb737030 --- /dev/null +++ b/app/controllers/categories_controller.rb @@ -0,0 +1,39 @@ +class CategoriesController < ApplicationController + + def index + @categories = Category.all + end + + def new + @category = Category.new + end + + def create + @category = Category.new(category_params) + + + if @category.save + flash[:success] = "Category created" + redirect_to user_path(@user) + else + flash[:error] = "Category could not be created" + redirect_back(fallback_location: user_path(@user)) + end + end + + def show + @category = Category.find_by(id: params[:id]) + + if @category + @products = @category.get_products + else + redirect_to root_path + end + end + + private + def category_params + params.require(:category).permit(: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/order_items_controller.rb b/app/controllers/order_items_controller.rb new file mode 100644 index 0000000000..13d01e59c2 --- /dev/null +++ b/app/controllers/order_items_controller.rb @@ -0,0 +1,62 @@ +class OrderItemsController < ApplicationController + + def create + find_order + p_id = params[:order_item][:product_id] + + if @order.order_items.where(product_id: p_id).length != 0 + flash[:error] = "Product already exists in cart" + redirect_to new_order_path + else + @order_item = @order.order_items.new(order_item_params) + @order_item.order_id = @order.id + + if @order_item.save + flash[:success] = "Added to cart" + redirect_to new_order_path + else + @products = Product.sorted + flash[:error] = "Product not added to cart" + render '/products/index', status: :bad_request + end + end + end + + def update + @order = find_order + order_item = OrderItem.find(params[:id]) + new_quantity = params[:quantity][:quantity] + + if order_item.update(quantity: new_quantity) + flash[:success] = "Quantity updated" + redirect_to new_order_path + else + flash[:error] = "Quantity could not be updated" + redirect_back(fallback_location: new_order_path) + end + end + + def destroy + if OrderItem.exists?(id: params[:id]) + item = OrderItem.find(params[:id]) + if item.destroy + flash[:success] = "Product removed from cart" + redirect_back(fallback_location: new_order_path) + else + flash[:error] = "Product was not removed from cart" + redirect_back(fallback_location: new_order_path) + end + else + @products = Product.sorted + flash[:error] = "Product does not exist" + render '/products/index', status: :bad_request + end + end + + private + + def order_item_params + params.require(:order_item).permit(:quantity, :product_id, :order_id) + end + +end diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb new file mode 100644 index 0000000000..e7d6c339c1 --- /dev/null +++ b/app/controllers/orders_controller.rb @@ -0,0 +1,46 @@ +class OrdersController < ApplicationController + before_action :find_order + + def index + @orders = Order.all + end + + def show + if Order.exists?(id: params[:id]) + @processed_order = Order.find(params[:id]) + @total = @processed_order.get_total + else + find_order + render :new, status: :not_found + end + end + + def update + + @order.update_attributes(update_order_params) + + if @order.save + + flash[:success] = "Thank you for placing your order!" + + @order.order_items.each do |item| + product = Product.find(item.product_id) + product.change_stock(item.quantity) + end + + processed_order_id = @order.id + + make_new_order + redirect_to order_path(processed_order_id) + else + flash.now[:alert] = @order.errors + render :new, status: :bad_request + end + end + + + private + def update_order_params + params.require(:order).permit(:status, :cc_num, :cvv, :state, :city, :zip, :name_on_card, :street_address, :email, ) + end +end diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb new file mode 100644 index 0000000000..2c2544557e --- /dev/null +++ b/app/controllers/products_controller.rb @@ -0,0 +1,76 @@ +class ProductsController < ApplicationController + + def new + @product = Product.new + end + + def create + + @product = Product.create(product_params) + @category = Category.new + + if @product.save + flash[:result_text] = "Successfully created #{@product.name}" + redirect_to products_path + else + flash[:result_text] = "Could not create #{@product.name}" + render :new, status: :bad_request + end + end + + def index + @categories= Category.all + @products = Product.sorted + find_order + @orders_products = @order.order_items.new + end + + def show + @product = Product.find_by(id: params[:id]) + @merchant = User.find_by(id: @product.user_id) + + if @product.nil? + redirect_to products_path + end + + if @user + @order = Order.find(session[:user_open_order_id]) + else + @order = session[:guest_order] + end + + @order_item = OrderItem.new(product_id: @product.id) + end + + def edit + # @merchant = User.find_by(id: params[:id]) + # if @merchant != @user + # flash[:status] = :error + # flash[:result_text] = "Need permission to do that!" + # redirect_back fallback_location: root_path + # end + @product = Product.find_by(id: params[:id]) + # raise + end + + def update + @product = Product.find_by(id: params[:id]) + if @product.update(product_params) + flash[:status] = :success + flash[:result_text] = "Successfully updated #{@product.name}" + redirect_to products_path + else + flash.now[:status] = :failure + flash.now[:result_text] = "Could not update #{@product.name}" + flash.now[:messages] = @product.errors.messages + render :edit, status: :not_found + end + end + + + private + def product_params + params.require(:product).permit(:name, :stock, :price, :description, :status, :user_id, :image_url, category_ids:[]) + end + +end diff --git a/app/controllers/reviews_controller.rb b/app/controllers/reviews_controller.rb new file mode 100644 index 0000000000..0e8e0a7d6a --- /dev/null +++ b/app/controllers/reviews_controller.rb @@ -0,0 +1,43 @@ +class ReviewsController < ApplicationController + + before_action :find_product, only: [:new] + + def new + if session[:user_id] == @product.user_id + flash[:message] = "You cant review your product" + redirect_to products_path + return + else + @review = Review.new + end + + end + + def create + @product = Product.find_by(id: params[:product_id]) + @review = @product.reviews.new( + review_params + ) + if @review.save + flash[:result_text] = "Successfully reviewed!" + redirect_to product_path(@product.id) + + else + render :new, status: :bad_request + end + end + + private + + def find_product + @product = Product.find_by(id: params[:product_id]) + unless @product + head :not_found + end + end + + def review_params + return params.require(:review).permit(:rating, :text_review, :product_id) + end + +end diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb new file mode 100644 index 0000000000..c3aa7706ff --- /dev/null +++ b/app/controllers/sessions_controller.rb @@ -0,0 +1,46 @@ +class SessionsController < ApplicationController + + + def create + auth_hash = request.env['omniauth.auth'] + + if auth_hash['uid'] + @user = User.find_by(uid: auth_hash[:uid], provider: params[:provider]) + + if @user.nil? + + # make a new user with method from model + @user = User.build_from_github(auth_hash) + successful_save = @user.save + if successful_save + flash[:success] = "Logged in successfully" + redirect_to user_path(user.id) + else + flash[:error] = "Some error happened in user creation" + redirect_to root_path + end + else + flash[:success] = "Logged in successfully #{@user.username}" + redirect_to root_path + end + + session[:user_id] = @user.id + new_order = Order.new(status: "pending") + new_order.save + session[:user_open_order_id] = new_order.id + + else + flash[:error] = "Logging in through GitHub not successful" + redirect_to root_path + end + end + + + def destroy + session[:user_id] = nil + + flash[:success] = "Successfully logged out!" + redirect_back(fallback_location: root_path) + + end +end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb new file mode 100644 index 0000000000..1f576702b9 --- /dev/null +++ b/app/controllers/users_controller.rb @@ -0,0 +1,24 @@ +class UsersController < ApplicationController + + def index + @users = User.where.not(username: "guest") + end + + def show + @merchant = User.find_by(id: params[:id]) + @products = Product.by_merchant(@merchant.id) + @orders = Order.merchant_orders(@merchant.id) + end + + def update + user = User.find_by(id: params[:id]) + user.update(user_params) + flash[:success] = "#{user.username} updated" + redirect_to user_path(params[:id]) + end + + private + def user_params + return params.require(:user).permit(:username, :id, :email) + end +end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb new file mode 100644 index 0000000000..8460038f19 --- /dev/null +++ b/app/helpers/application_helper.rb @@ -0,0 +1,19 @@ +module ApplicationHelper + def set_class(rating) + case rating + when 0 + "zero-stars" + when 1 + "one-star" + when 2 + "two-stars" + when 3 + "three-stars" + when 4 + "four-stars" + when 5 + "five-stars" + end + end + module_function :set_class +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/order_items_helper.rb b/app/helpers/order_items_helper.rb new file mode 100644 index 0000000000..e197528ae1 --- /dev/null +++ b/app/helpers/order_items_helper.rb @@ -0,0 +1,2 @@ +module OrderItemsHelper +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/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/helpers/users_helper.rb b/app/helpers/users_helper.rb new file mode 100644 index 0000000000..2310a240d7 --- /dev/null +++ b/app/helpers/users_helper.rb @@ -0,0 +1,2 @@ +module UsersHelper +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..c2fe9f09a7 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,8 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true + + def self.find_user + @user = User.find_by(id: session[:user_id]) + end + +end diff --git a/app/models/category.rb b/app/models/category.rb new file mode 100644 index 0000000000..bcccb37a4b --- /dev/null +++ b/app/models/category.rb @@ -0,0 +1,11 @@ +class Category < ApplicationRecord + has_and_belongs_to_many :products + + validates :name, presence: true, uniqueness: true, length: { maximum: 30, too_long: "Name must be shorter than 30 characters." + } + + def get_products + self.products.where(status: true) + end + +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/order.rb b/app/models/order.rb new file mode 100644 index 0000000000..ddcd2c111b --- /dev/null +++ b/app/models/order.rb @@ -0,0 +1,101 @@ +class Order < ApplicationRecord + has_many :order_items + has_many :products, through: :order_items + + + validates :name_on_card, presence: true, on: :update + validates :email, format: { with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i, on: :update } + validates :cc_num, presence: true, format: { with: /\A\d+\z/ }, on: :update, length: 15..16 + validates :cvv, presence: true, numericality: {greater_than_or_equal_to: 0, only_integer: true}, length: { is: 3 }, on: :update + validates :street_address, presence: true, on: :update + validates :city, presence: true,format: { with: /\A[a-zA-Z]+(?: [a-zA-Z]+)?\z/ }, on: :update + validates :zip, presence: true, format: { with: /\A\d+\z/ }, on: :update, length: { is: 5} + + + + def self.merchant_products(id) + Product.where(user_id: id) + end + + def self.merchant_orders(id) + merchandise = merchant_products(id) + + orders = [] + merchandise.each do |item| + item.orders.each do |ord| + orders << ord + end + end + + return orders.uniq + end + + def get_total + total = 0 + self.order_items.each do |item| + product = Product.find(item.product_id) + sub_total = product.price * item.quantity + total += sub_total + end + + return total + end + + STATES = + [ + ['Alabama', 'AL'], + ['Alaska', 'AK'], + ['Arizona', 'AZ'], + ['Arkansas', 'AR'], + ['California', 'CA'], + ['Colorado', 'CO'], + ['Connecticut', 'CT'], + ['Delaware', 'DE'], + ['District of Columbia', 'DC'], + ['Florida', 'FL'], + ['Georgia', 'GA'], + ['Hawaii', 'HI'], + ['Idaho', 'ID'], + ['Illinois', 'IL'], + ['Indiana', 'IN'], + ['Iowa', 'IA'], + ['Kansas', 'KS'], + ['Kentucky', 'KY'], + ['Louisiana', 'LA'], + ['Maine', 'ME'], + ['Maryland', 'MD'], + ['Massachusetts', 'MA'], + ['Michigan', 'MI'], + ['Minnesota', 'MN'], + ['Mississippi', 'MS'], + ['Missouri', 'MO'], + ['Montana', 'MT'], + ['Nebraska', 'NE'], + ['Nevada', 'NV'], + ['New Hampshire', 'NH'], + ['New Jersey', 'NJ'], + ['New Mexico', 'NM'], + ['New York', 'NY'], + ['North Carolina', 'NC'], + ['North Dakota', 'ND'], + ['Ohio', 'OH'], + ['Oklahoma', 'OK'], + ['Oregon', 'OR'], + ['Pennsylvania', 'PA'], + ['Puerto Rico', 'PR'], + ['Rhode Island', 'RI'], + ['South Carolina', 'SC'], + ['South Dakota', 'SD'], + ['Tennessee', 'TN'], + ['Texas', 'TX'], + ['Utah', 'UT'], + ['Vermont', 'VT'], + ['Virginia', 'VA'], + ['Washington', 'WA'], + ['West Virginia', 'WV'], + ['Wisconsin', 'WI'], + ['Wyoming', 'WY'] + ] + + +end diff --git a/app/models/order_item.rb b/app/models/order_item.rb new file mode 100644 index 0000000000..7d351ea539 --- /dev/null +++ b/app/models/order_item.rb @@ -0,0 +1,24 @@ +class OrderItem < ApplicationRecord + belongs_to :product + belongs_to :order + + + def get_subtotal + product = Product.find(self.product_id) + sub_total = product.price * self.quantity + return sub_total + end + + def already_exists? + this_id = self.product_id + order = Order.find(self.order_id) + + order.order_items.each do |item| + if item.product_id = this_id + return true + end + end + + return false + end +end diff --git a/app/models/product.rb b/app/models/product.rb new file mode 100644 index 0000000000..908ad6b1bd --- /dev/null +++ b/app/models/product.rb @@ -0,0 +1,46 @@ +class Product < ApplicationRecord + has_and_belongs_to_many :categories + has_many :order_items + has_many :orders, through: :order_items + has_many :reviews + + # validates :user_id, presence: true + + 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} + + def average_rating + return reviews.average(:rating).to_i + end + + def self.available + Product.where(status: true) + end + + def self.sorted + available.order(:name) + end + + + def self.by_category(category) + assigned = Product.where.not(category: []) + selected = assigned.select {|product| product.categories.include?(category)} + + return selected + end + + def self.by_merchant(id) + return Product.where(user_id: id) + end + + + def change_stock(quantity) + total = self.stock + number = total - quantity + self.stock = number + self.save + end + + +end diff --git a/app/models/review.rb b/app/models/review.rb new file mode 100644 index 0000000000..ffc3f0e0a4 --- /dev/null +++ b/app/models/review.rb @@ -0,0 +1,10 @@ +class Review < ApplicationRecord + belongs_to :product + + belongs_to :user, optional: true + + validates :rating, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 1, less_than_or_equal_to: 5 } + validates :text_review, length: { maximum: 500, too_long: "Review must be under 500 characters." } + + +end diff --git a/app/models/user.rb b/app/models/user.rb new file mode 100644 index 0000000000..2bac797faf --- /dev/null +++ b/app/models/user.rb @@ -0,0 +1,39 @@ +class User < ApplicationRecord + + has_many :products + + + validates :username, presence: true, uniqueness: true + validates :email, presence: true, uniqueness: true + + def self.build_from_github(auth_hash) + return User.new( + provider: auth_hash[:provider], uid: auth_hash[:uid], email: auth_hash[:info][:email], username: auth_hash[:info][:nickname] + ) + end + + def get_order_items + my_items = self.products + + mine = [] + my_items.each do |product| + mine << product.order_items + end + return mine + end + + def get_total_revenue + mine = get_order_items + + total = 0 + + mine.each do |o_items| + o_items.each do |item| + total += item.product.price * item.quantity + end + end + return total + end + + +end diff --git a/app/views/categories/index.html.erb b/app/views/categories/index.html.erb new file mode 100644 index 0000000000..80cf70520f --- /dev/null +++ b/app/views/categories/index.html.erb @@ -0,0 +1,8 @@ +

Categories#index

+ diff --git a/app/views/categories/new.html.erb b/app/views/categories/new.html.erb new file mode 100644 index 0000000000..600796ba6a --- /dev/null +++ b/app/views/categories/new.html.erb @@ -0,0 +1,10 @@ +

Categories

+

Add a new category

+
+ <%= form_for @category do |f| %> + <%= f.label :name %> + <%= f.text_field :name %> + + <%= f.submit 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..a3bb1647a5 --- /dev/null +++ b/app/views/categories/show.html.erb @@ -0,0 +1,19 @@ +

<%= @category.name.titleize %> Pets

+ +
+
+ <% @products.each do |product| %> +
+
+

+ <%= link_to image_tag(product.image_url), product_path(product.id), :alt => "#{product.name} image", :title => "#{product.name}" %> +

+

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

+

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

+
+
+ <% end %> +
+
diff --git a/app/views/layouts/_starrating.html.erb b/app/views/layouts/_starrating.html.erb new file mode 100644 index 0000000000..18be452aaa --- /dev/null +++ b/app/views/layouts/_starrating.html.erb @@ -0,0 +1,5 @@ + +<%= '★' * rating %><%= '☆' * (5 - rating) %> + diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb new file mode 100644 index 0000000000..ff32908cda --- /dev/null +++ b/app/views/layouts/application.html.erb @@ -0,0 +1,73 @@ + + + + + + + + + <%= content_for?(:title) ? yield(:title) : "pEsty Adoption" %> + + <%= stylesheet_link_tag "application" %> + <%= javascript_include_tag "application", 'data-turbolinks-track' => true %> + <%= csrf_meta_tags %> + + + +
+
+
+

Welcome To Petsy

+

The Site for Animal Adoption by Ada People for Pets (APP)

+
+ +
+ + +
+ <% flash.each do |name, message| %> +
+ <% if name == "alert" %> +
    + <% flash[:alert].each do |field, message| %> +
  • + <%= field.capitalize %> <%= message %> +
  • + <% end %> +
+ <% else %> +

+ <%= message %> +

+ <% end %> +
+ <% end %> +
+ +
+ <%= 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/orders/_complete_form.html.erb b/app/views/orders/_complete_form.html.erb new file mode 100644 index 0000000000..0d38062e1f --- /dev/null +++ b/app/views/orders/_complete_form.html.erb @@ -0,0 +1,42 @@ +
+
+ <%= form_for @order do |f| %> + + <%= f.label :name_on_card, "Name on Credit Card" %> + <%= f.text_field :name_on_card %> + + <%= f.label :email %> + <%= f.email_field :email %> + + <%= f.label :street_address %> + <%= f.text_field :street_address %> + + <%= f.label :state %> + <%= f.select :state, Order::STATES %> + + <%= f.label :city %> + <%= f.text_field :city %> + + <%= f.label :zip %> + <%= f.number_field :zip %> + + <%= f.label :cc_num, "Credit Card Number" %> + <%= f.number_field :cc_num %> + + + <%= f.label :cvv, "Credit Card CCV" %> + <%= f.number_field :cvv %> + + <% if @user %> + <%= hidden_field_tag "user", @user.id %> + <% else %> + <%= hidden_field_tag "user", session[:guest_order_id] %> + <% end %> + + <%= f.hidden_field :status, value: "paid" %> + + <%= f.submit "Complete Payment", class: "button" %> + + <% end %> +
+
diff --git a/app/views/orders/create.html.erb b/app/views/orders/create.html.erb new file mode 100644 index 0000000000..295bd84094 --- /dev/null +++ b/app/views/orders/create.html.erb @@ -0,0 +1,2 @@ +

Orders#create

+

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

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

Orders#destroy

+

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

diff --git a/app/views/orders/edit.html.erb b/app/views/orders/edit.html.erb new file mode 100644 index 0000000000..7de9049bee --- /dev/null +++ b/app/views/orders/edit.html.erb @@ -0,0 +1,2 @@ +

Orders#edit

+

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

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

Orders#index

+

Find me in app/views/orders/index.html.erb

+ + diff --git a/app/views/orders/new.html.erb b/app/views/orders/new.html.erb new file mode 100644 index 0000000000..755cd93f13 --- /dev/null +++ b/app/views/orders/new.html.erb @@ -0,0 +1,23 @@ +

My Cart

+ +<% @order.order_items.each do |item| %> +<% id = item.product_id %> +<% product = Product.find(id) %> +<%= product.name %> + +Quantity: <%= form_for :quantity, url: order_item_path(item.id), method: :put do |f| %> +<%= f.number_field :quantity, value: item.quantity, min: 1, max: product.stock %> +<%= f.submit "Update Quantity" %> +<% end %> + +<%= form_for item, url: order_item_path(item.id), method: :delete do |f| %> +<%= f.submit "Delete Item" %> +<% end %> + +<% end %> + +

Payment Information

+ +<%= render partial: "complete_form" %> diff --git a/app/views/orders/show.html.erb b/app/views/orders/show.html.erb new file mode 100644 index 0000000000..04b7b674f8 --- /dev/null +++ b/app/views/orders/show.html.erb @@ -0,0 +1,26 @@ +

Order Confirmation

+ +
+
+

Customer Information:

+

<%= @processed_order.email %>

+

<%= @processed_order.name_on_card %>
<%= @processed_order.street_address %>
<%= @processed_order.city %>, <%= @processed_order.state %>, <%= @processed_order.zip %>

+

CC: <%= @processed_order.cc_num.last(4) %>

+
+
+ <% @processed_order.order_items.each do |item| %> + <% product = Product.find(item.product_id) %> +

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

+ + <% end %> +
+
+

Order Total: $<%= @processed_order.get_total %>

+

Order Status: <%= @processed_order.status %>

+

Date Ordered: <%= @processed_order.created_at.to_formatted_s(:long) %>

+
+
diff --git a/app/views/orders/update.html.erb b/app/views/orders/update.html.erb new file mode 100644 index 0000000000..21caac1f70 --- /dev/null +++ b/app/views/orders/update.html.erb @@ -0,0 +1,2 @@ +

Orders#update

+

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

diff --git a/app/views/products/_form.html.erb b/app/views/products/_form.html.erb new file mode 100644 index 0000000000..63a086bd91 --- /dev/null +++ b/app/views/products/_form.html.erb @@ -0,0 +1,32 @@ +
+ <%= form_for @product, url: destination do |f| %> + +
+ <%= f.label :categories %> + <%= collection_check_boxes(:product, :category_ids, Category.all, :id, :name) %> +
+ + <%= f.label :name %> + <%= f.text_field :name %> + + <%= f.label :price %> + <%= f.text_field :price %> + + <%= f.label :stock %> + <%= f.text_field :stock %> + + <%= f.label :available_to_purchase? %> + <%= f.select :status, ["true", "false"] %> + + <%= f.label :description %> + <%= f.text_field :description %> + + <%= f.label :image_url %> + <%= f.text_field :image_url %> + + <%= f.label :user %> + <%= f.text_field :user_id %> + + <%= f.submit class: "button" %> + <% end %> +
diff --git a/app/views/products/create.html.erb b/app/views/products/create.html.erb new file mode 100644 index 0000000000..d546021001 --- /dev/null +++ b/app/views/products/create.html.erb @@ -0,0 +1,2 @@ +

Products#create

+

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

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

Products#destroy

+

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

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

Products

+

Edit a product

+<%= render partial: "form", locals: {page_title: "Edit Product", destination: user_product_path(@user, @product)}%> diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb new file mode 100644 index 0000000000..5cbe91528a --- /dev/null +++ b/app/views/products/index.html.erb @@ -0,0 +1,18 @@ +

+
+
+ <% @products.each do |product| %> +
+
+

+ <%= link_to image_tag(product.image_url), product_path(product.id), :alt => "#{product.name} image", :title => "#{product.name}" %> +

+

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

+

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

+
+
+ <% end %> +
+
diff --git a/app/views/products/new.html.erb b/app/views/products/new.html.erb new file mode 100644 index 0000000000..47bf6a1add --- /dev/null +++ b/app/views/products/new.html.erb @@ -0,0 +1,3 @@ +

Products

+

Add a new product

+<%= render partial: "form", locals: {page_title: "New Product", destination: user_products_path(@user.id)}%> diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb new file mode 100644 index 0000000000..e8d0eee1df --- /dev/null +++ b/app/views/products/show.html.erb @@ -0,0 +1,69 @@ +
+ <% if @product.status == false || @product.stock == 0 %>
+ + <% end %> +
+
+
+ <%= image_tag(@product.image_url) %> + + +
+

<%= @product.name %>

+

By <%= link_to @merchant.username, user_path(@merchant.id) %>

+

<%= render partial: "layouts/starrating", locals: { rating: @product.average_rating } %> + (<%= @product.reviews.count %>)

+ + + +

Price:$ <%= (@product.price) %>

+ <%if @product.stock == 0%> + No stock for retired products + <% else %> + <% if @product.stock != nil && @product.stock != 0 %> +

In Stock (only <%= @product.stock %> left)

+ <% else %> +

Out of Stock

+ <% end %> + <% end %> +

Description: + <%= @product.description %>

+ + + + + <% if @product.stock != 0 %> + <%= form_for @order_item do |f| %> + <%= f.hidden_field :product_id, value: @product.id%> + <%= f.label :Quantity %> + <%= f.select :quantity, (1..@product.stock).to_a %> + <%= f.submit "Add to Cart", class: "cart button"%> + <% end %> + <%end%> + + + + +
+
+

Customer Reviews:

+

<%= render partial: "layouts/starrating", locals: { rating: @product.average_rating } %> (<%= @product.reviews.count %>)

+
+ <% @product.reviews.each do |review| %> +
+

<%= render partial: "layouts/starrating", locals: { rating: review.rating } %>

+ <% if @user %> +

Reviewed by: <%= @user.username %>

+ <% else %> +

Reviewed by: Guest

+ <% end %> +

Reviewed on: <%= review.created_at.localtime.strftime("%d %b %Y") %>

+

Review: "<%= review.text_review %>"

+
+ <% end %> + <%= link_to "Write a Review", new_product_review_path(@product.id), class: " button" %> +
+ +
diff --git a/app/views/products/update.html.erb b/app/views/products/update.html.erb new file mode 100644 index 0000000000..039889ac02 --- /dev/null +++ b/app/views/products/update.html.erb @@ -0,0 +1,2 @@ +

Products#update

+

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

diff --git a/app/views/reviews/index.html.erb b/app/views/reviews/index.html.erb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/views/reviews/new.html.erb b/app/views/reviews/new.html.erb new file mode 100644 index 0000000000..a0cf0d3bd0 --- /dev/null +++ b/app/views/reviews/new.html.erb @@ -0,0 +1,13 @@ +

Write a review!

+ + + <%= form_for :review, :url => {:action => "create", :id => @product} do |f| %> + + <%= f.label :text_review %> + <%= f.text_area :text_review %> + + <%= f.label :rating %> + <%= f.select :rating, options_for_select(1.. 5) %> + +

<%= f.submit class: "button" %>

+ <% end %> diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb new file mode 100644 index 0000000000..98d4d50c23 --- /dev/null +++ b/app/views/users/index.html.erb @@ -0,0 +1,11 @@ +
+

All Shopkeepers

+
+ +
    + <% @users.each do |user| %> +
  • + <%= link_to user.username, user_path(user.id) %> +
  • + <% end %> +
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb new file mode 100644 index 0000000000..9ec164f05d --- /dev/null +++ b/app/views/users/show.html.erb @@ -0,0 +1,73 @@ +

<%= @merchant.username %>'s Shop

+ +
+
+ <% if @merchant == @user %> +
+

+ <%= link_to "Add New Product", new_user_product_path(@user.id), class: "button" %> + <%= link_to "Add New Category", new_category_path, class: "button" %> +

+ <% end %> + <% if @products.length == 0 %> +

+ No items yet! +

+ <% else %> +
+ <% @products.each do |product| %> +
+
+

+ <%= link_to image_tag(product.image_url), product_path(product.id), :alt => "#{product.name} image", :title => "#{product.name}" %> +

+

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

+

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

+

+ <% if @merchant == @user %> + <%= link_to "Edit #{product.name}", edit_user_product_path(@user.id, product.id), class: "button" %> + <% end %> +

+
+
+ <% end %> + <% end %> +
+
+ +
+ <% if @merchant == @user %> +
+
+

Stats for <%= @merchant.username %>

+

Total Orders: <%= @orders.count %>

+

Total Revenue: $<%= @merchant.get_total_revenue %>

+
+ +
+

Order Console

+
+ <% @orders.each do |sub_order| %> +
    +
  • <%= link_to "Order #{sub_order.id}", order_path(sub_order) %>
  • +
  • Status: <%= sub_order.status %>
  • +
      + <% sub_order.order_items.each do |item| %> + <% if item.product.user_id == @user.id %> +
    • Creature: <%= item.product.name %>
    • +
    • Quantity: <%= item.quantity %>
    • +
    • Price: $<%= item.product.price * item.quantity %>

    • + + <% end %> + <% end %> +
    +
+ <% end %> +
+
+
+ <% end %> + +
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..f5b29c6cdc --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,22 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + root 'products#index', as: 'root' + + + resources :users + resources :orders, only: [:index, :show, :update, :new] + resources :categories, only: [:index, :new, :create, :show] + resources :order_items, only: [:create, :update, :destroy] + resources :products, only: [:show, :index] + + resources :users do + resources :products, only: [:new, :create, :edit, :update] + end + + post "/product/:product_id/reviews", to: "reviews#create", as: "product_reviews" + get "/products/:product_id/reviews/new", to: "reviews#new", as: "new_product_review" + + get "/auth/github", as: 'github_login' + get "/auth/:provider/callback", to: "sessions#create", as: "auth_callback" + delete '/logout', to: 'sessions#destroy', as: 'logout' +end diff --git a/config/secrets.yml b/config/secrets.yml new file mode 100644 index 0000000000..fbb53c9653 --- /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: f5f317d86d7f21fcda8530d9bbc1579f39265ecd3c5fa61c7ec0bc5b06fcdab157a69d3e1ea5417423e36fea247a85d20887a14cbefd8dc80feaa43e768086e3 + +test: + secret_key_base: 52be4c70a272fd3228fa947bd8b6a72188f3285af927ddfc36553fec6105bb93dcb6b5e01c6bc20d86be0699b8fad226a4b5eef674878a75145a59d58244bc30 + +# 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/20180419170141_create_products.rb b/db/migrate/20180419170141_create_products.rb new file mode 100644 index 0000000000..49c4c470cb --- /dev/null +++ b/db/migrate/20180419170141_create_products.rb @@ -0,0 +1,15 @@ +class CreateProducts < ActiveRecord::Migration[5.1] + def change + create_table :products do |t| + t.string :name + t.integer :stock + t.integer :price + t.string :description + t.boolean :status + t.string :category + t.string :image_url + + t.timestamps + end + end +end diff --git a/db/migrate/20180419170403_create_reviews.rb b/db/migrate/20180419170403_create_reviews.rb new file mode 100644 index 0000000000..f369d1c988 --- /dev/null +++ b/db/migrate/20180419170403_create_reviews.rb @@ -0,0 +1,9 @@ +class CreateReviews < ActiveRecord::Migration[5.1] + def change + create_table :reviews do |t| + t.integer :rating + + t.timestamps + end + end +end diff --git a/db/migrate/20180419170702_create_orders.rb b/db/migrate/20180419170702_create_orders.rb new file mode 100644 index 0000000000..82264eacb1 --- /dev/null +++ b/db/migrate/20180419170702_create_orders.rb @@ -0,0 +1,16 @@ +class CreateOrders < ActiveRecord::Migration[5.1] + def change + create_table :orders do |t| + t.string :status + t.integer :cc_num + t.integer :cvv + t.string :email + t.string :street_address + t.string :state + t.string :city + t.integer :zip + + t.timestamps + end + end +end diff --git a/db/migrate/20180419170846_create_users.rb b/db/migrate/20180419170846_create_users.rb new file mode 100644 index 0000000000..59010f7a8a --- /dev/null +++ b/db/migrate/20180419170846_create_users.rb @@ -0,0 +1,12 @@ +class CreateUsers < ActiveRecord::Migration[5.1] + def change + create_table :users do |t| + t.string :username + t.string :email + t.integer :uid + t.string :provider + + t.timestamps + end + end +end diff --git a/db/migrate/20180419170950_create_categories.rb b/db/migrate/20180419170950_create_categories.rb new file mode 100644 index 0000000000..5bef4913b8 --- /dev/null +++ b/db/migrate/20180419170950_create_categories.rb @@ -0,0 +1,9 @@ +class CreateCategories < ActiveRecord::Migration[5.1] + def change + create_table :categories do |t| + t.string :name + + t.timestamps + end + end +end diff --git a/db/migrate/20180419201142_create_join_table_products_orders.rb b/db/migrate/20180419201142_create_join_table_products_orders.rb new file mode 100644 index 0000000000..4fc5e631d5 --- /dev/null +++ b/db/migrate/20180419201142_create_join_table_products_orders.rb @@ -0,0 +1,8 @@ +class CreateJoinTableProductsOrders < ActiveRecord::Migration[5.1] + def change + create_join_table :products, :orders do |t| + # t.index [:product_id, :order_id] + # t.index [:order_id, :product_id] + end + end +end diff --git a/db/migrate/20180419201409_create_join_table_products_categories.rb b/db/migrate/20180419201409_create_join_table_products_categories.rb new file mode 100644 index 0000000000..4dc1e42284 --- /dev/null +++ b/db/migrate/20180419201409_create_join_table_products_categories.rb @@ -0,0 +1,8 @@ +class CreateJoinTableProductsCategories < ActiveRecord::Migration[5.1] + def change + create_join_table :products, :categories do |t| + # t.index [:product_id, :category_id] + # t.index [:category_id, :product_id] + end + end +end diff --git a/db/migrate/20180419201856_create_products_categories.rb b/db/migrate/20180419201856_create_products_categories.rb new file mode 100644 index 0000000000..8c779dd726 --- /dev/null +++ b/db/migrate/20180419201856_create_products_categories.rb @@ -0,0 +1,9 @@ +class CreateProductsCategories < ActiveRecord::Migration[5.1] + def change + create_table :products_categories do |t| + t.integer :quantity + + t.timestamps + end + end +end diff --git a/db/migrate/20180419205915_add_name_on_card_to_order.rb b/db/migrate/20180419205915_add_name_on_card_to_order.rb new file mode 100644 index 0000000000..d310d3b34c --- /dev/null +++ b/db/migrate/20180419205915_add_name_on_card_to_order.rb @@ -0,0 +1,5 @@ +class AddNameOnCardToOrder < ActiveRecord::Migration[5.1] + def change + add_column :orders, :name_on_card, :string + end +end diff --git a/db/migrate/20180419210438_add_quantity_to_orders_products.rb b/db/migrate/20180419210438_add_quantity_to_orders_products.rb new file mode 100644 index 0000000000..10544e2616 --- /dev/null +++ b/db/migrate/20180419210438_add_quantity_to_orders_products.rb @@ -0,0 +1,5 @@ +class AddQuantityToOrdersProducts < ActiveRecord::Migration[5.1] + def change + add_column :orders_products, :quantity, :integer + end +end diff --git a/db/migrate/20180419210701_add_text_review_to_reviews.rb b/db/migrate/20180419210701_add_text_review_to_reviews.rb new file mode 100644 index 0000000000..88d1279d42 --- /dev/null +++ b/db/migrate/20180419210701_add_text_review_to_reviews.rb @@ -0,0 +1,5 @@ +class AddTextReviewToReviews < ActiveRecord::Migration[5.1] + def change + add_column :reviews, :text_review, :string + end +end diff --git a/db/migrate/20180419211006_remove_category_from_products.rb b/db/migrate/20180419211006_remove_category_from_products.rb new file mode 100644 index 0000000000..f36bc48965 --- /dev/null +++ b/db/migrate/20180419211006_remove_category_from_products.rb @@ -0,0 +1,5 @@ +class RemoveCategoryFromProducts < ActiveRecord::Migration[5.1] + def change + remove_column :products, :category, :string + end +end diff --git a/db/migrate/20180419221427_add_user_id_column_to_products_table.rb b/db/migrate/20180419221427_add_user_id_column_to_products_table.rb new file mode 100644 index 0000000000..e99089e342 --- /dev/null +++ b/db/migrate/20180419221427_add_user_id_column_to_products_table.rb @@ -0,0 +1,5 @@ +class AddUserIdColumnToProductsTable < ActiveRecord::Migration[5.1] + def change + add_column :products, :user_id, :integer + end +end diff --git a/db/migrate/20180421034944_change_table_name_orders_products_to_order_items.rb b/db/migrate/20180421034944_change_table_name_orders_products_to_order_items.rb new file mode 100644 index 0000000000..d0bd74d376 --- /dev/null +++ b/db/migrate/20180421034944_change_table_name_orders_products_to_order_items.rb @@ -0,0 +1,5 @@ +class ChangeTableNameOrdersProductsToOrderItems < ActiveRecord::Migration[5.1] + def change + rename_table :orders_products, :OrderItems + end +end diff --git a/db/migrate/20180421035821_change_table_name_order_items_to_order_items.rb b/db/migrate/20180421035821_change_table_name_order_items_to_order_items.rb new file mode 100644 index 0000000000..4c825edfff --- /dev/null +++ b/db/migrate/20180421035821_change_table_name_order_items_to_order_items.rb @@ -0,0 +1,5 @@ +class ChangeTableNameOrderItemsToOrderItems < ActiveRecord::Migration[5.1] + def change + rename_table :OrderItems, :order_items + end +end diff --git a/db/migrate/20180421040238_drop_categories_product.rb b/db/migrate/20180421040238_drop_categories_product.rb new file mode 100644 index 0000000000..b9ad5125a0 --- /dev/null +++ b/db/migrate/20180421040238_drop_categories_product.rb @@ -0,0 +1,9 @@ +class DropCategoriesProduct < ActiveRecord::Migration[5.1] + def change + drop_table :categories_products do |t| + t.bigint "product_id", null: false + t.bigint "category_id", null: false + t.timestamps null: false + end + end +end diff --git a/db/migrate/20180421040743_add_productid_to_review_table.rb b/db/migrate/20180421040743_add_productid_to_review_table.rb new file mode 100644 index 0000000000..74cca18c1c --- /dev/null +++ b/db/migrate/20180421040743_add_productid_to_review_table.rb @@ -0,0 +1,5 @@ +class AddProductidToReviewTable < ActiveRecord::Migration[5.1] + def change + add_column :reviews, :user_id, :bigint + end +end diff --git a/db/migrate/20180421041521_change_ccnum_column_to_strng.rb b/db/migrate/20180421041521_change_ccnum_column_to_strng.rb new file mode 100644 index 0000000000..b8abe58291 --- /dev/null +++ b/db/migrate/20180421041521_change_ccnum_column_to_strng.rb @@ -0,0 +1,5 @@ +class ChangeCcnumColumnToStrng < ActiveRecord::Migration[5.1] + def change + change_column :orders, :cc_num, :string + end +end diff --git a/db/migrate/20180421054721_add_product_id_to_reviews_table_try_two.rb b/db/migrate/20180421054721_add_product_id_to_reviews_table_try_two.rb new file mode 100644 index 0000000000..8404eab6ad --- /dev/null +++ b/db/migrate/20180421054721_add_product_id_to_reviews_table_try_two.rb @@ -0,0 +1,7 @@ +class AddProductIdToReviewsTableTryTwo < ActiveRecord::Migration[5.1] + def change + def change + add_column :reviews, :product_id, :bigint + end + end +end diff --git a/db/migrate/20180421055333_add_product_id_to_reviews_table_try_three.rb b/db/migrate/20180421055333_add_product_id_to_reviews_table_try_three.rb new file mode 100644 index 0000000000..efc65d84ae --- /dev/null +++ b/db/migrate/20180421055333_add_product_id_to_reviews_table_try_three.rb @@ -0,0 +1,7 @@ +class AddProductIdToReviewsTableTryThree < ActiveRecord::Migration[5.1] + def change + def change + add_column :reviews, :user_id, :integer + end + end +end diff --git a/db/migrate/20180421055653_add_product_id_to_reviews_table_try_four.rb b/db/migrate/20180421055653_add_product_id_to_reviews_table_try_four.rb new file mode 100644 index 0000000000..0ebd9dd2fc --- /dev/null +++ b/db/migrate/20180421055653_add_product_id_to_reviews_table_try_four.rb @@ -0,0 +1,5 @@ +class AddProductIdToReviewsTableTryFour < ActiveRecord::Migration[5.1] + def change + add_column :reviews, :product_id, :integer + end +end diff --git a/db/migrate/20180425070534_add_order_items_id.rb b/db/migrate/20180425070534_add_order_items_id.rb new file mode 100644 index 0000000000..85f5b49bbe --- /dev/null +++ b/db/migrate/20180425070534_add_order_items_id.rb @@ -0,0 +1,5 @@ +class AddOrderItemsId < ActiveRecord::Migration[5.1] + def change + add_column :order_items, :id, :primary_key + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 0000000000..73a50633fc --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,80 @@ +# 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: 20180425070534) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "categories", force: :cascade do |t| + t.string "name" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "categories_products", force: :cascade do |t| + t.bigint "category_id" + t.bigint "product_id" + t.integer "quantity" + end + + create_table "order_items", force: :cascade do |t| + t.bigint "product_id", null: false + t.bigint "order_id", null: false + t.integer "quantity" + end + + create_table "orders", force: :cascade do |t| + t.string "status" + t.string "cc_num" + t.integer "cvv" + t.string "email" + t.string "street_address" + t.string "state" + t.string "city" + t.integer "zip" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "name_on_card" + end + + create_table "products", force: :cascade do |t| + t.string "name" + t.integer "stock" + t.integer "price" + t.string "description" + t.boolean "status" + t.string "image_url" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.integer "user_id" + end + + create_table "reviews", force: :cascade do |t| + t.integer "rating" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "text_review" + t.bigint "user_id" + t.integer "product_id" + end + + create_table "users", force: :cascade do |t| + t.string "username" + t.string "email" + t.integer "uid" + t.string "provider" + 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..645390ea15 --- /dev/null +++ b/db/seed_data/categories.csv @@ -0,0 +1,4 @@ +id,name +1,exotic +2,fluffy +3,cute diff --git a/db/seed_data/orders.csv b/db/seed_data/orders.csv new file mode 100644 index 0000000000..38f4b6ae26 --- /dev/null +++ b/db/seed_data/orders.csv @@ -0,0 +1,11 @@ +id,status +1,pending +2,paid +3,complete +4,cancelled +5,paid +6,pending +7,complete +8,pending +9,pending +10,paid diff --git a/db/seed_data/products.csv b/db/seed_data/products.csv new file mode 100644 index 0000000000..1ee4b32032 --- /dev/null +++ b/db/seed_data/products.csv @@ -0,0 +1,20 @@ +id,user_id,image_url,name,price,stock,description +1,2,https://placekitten.com/g/200/300,Fluffy Kitten,400,2,Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s. +2,2,https://free-images.com/sm/ff13/brownthroated_twotoed_sloth.jpg,Three-Toed Sloth,2800,6,Chill, mellow, and mindful being. Great mediation partner. +3,1,https://free-images.com/sm/ac35/koala_bear_tree_sitting_0.jpg,Koala Bear,2000,4,Clocking in at an average of 18-22 hours of sleep per day, the Koala is the perfect sleep companion. +4,3,https://free-images.com/sm/54a4/giant_panda_2.jpg,Giant Panda,13000,1,The Giant Panda usually spends their time sleeping, and foraging for food. The Giant Panda would be a cool hiking mate. +5,3,https://free-images.com/sm/8eee/armadillo_portrait_standing_looking.jpg,Armadillo,799,2,Night Owl? Armadillos are most active in the evening, and sleep for 18-19 hours a day. Great late night buddy. +6,4,https://free-images.com/sm/9e2f/animal_bat_brown_close.jpg,Brown Bat,1350,8,Not only do Brown Bats sleep 20 hours a day, but they also hibernate half of the year! What a life, huh? If you need some deep rest, the Brown Bat is the pet for you. +7,5,https://free-images.com/sm/73c6/eye_dragon_dragon_s.jpg,Lovable Dragon,25000,2,Dragons are among the most popular and enduring of the world's mythological creatures. Dragon tales are known in many cultures, from the Americas to Europe to India to China. Though they populate our books, films, and television shows, they have a long and rich history in many forms. +8,5,https://free-images.com/sm/ddb7/triceratops_dinosaur_reptile_1640111.jpg,Cute Triceratops,60000,1,Triceratops is a genus of herbivorous ceratopsid dinosaur that first appeared during the late Maastrichtian stage of the late Cretaceous period, about 68 million years ago in what is now North America. +9,6,https://free-images.com/sm/1a04/maerten_de_vos_unicorn.jpg,Unicorn,80000,1,While many mythic creatures are man-eating monsters or evil spirits, others, like unicorns, are powerful and peaceful. +10,7,https://free-images.com/sm/360e/narwhal_psf_png.jpg,Nice Narwhal,50000,3,Often dubbed the unicorns of the sea, narwhals are strange and beautiful creatures with long tusks protruding from their heads. Members of the population of more than 80,000 can weigh up to 4,200 pounds and grow as long as 17 feet in length. +11,9,https://free-images.com/sm/7a67/stone_marble_rock.jpg,pet rock,50,1000,Don’t have the time in your busy schedule for caring for a living pet, but still desire loving companion? Rock your world with a pet rock! This pet will never cause you to get a noise complaint from your finicky neighbors! This pet will love you and express that love quietly. Very quietly. Your cute little rock will also never run away! Pet rock! +12,10,https://free-images.com/sm/7e74/elephant_baby_sl_c5.jpg,baby elephant,100,10,Sponsor this baby elephant that lives in a protected animal sanctuary because their mother has been taken away due to the illegal ivory trade. THIS IS TRAGIC, RIGHT?!?!? Take a stand against this and also support a cute little baby elephant that drinks milk from a bottle and will grow up to roam the wild rather than living in a tiny stupid zoo! :heart: +13,2,https://free-images.com/sm/3b44/hamster_pet_animal_small.jpg,hamster,10,20,Hamsters are weird, but that’s okay. They are still great pets! Hamsters love to tunnel and they also like those little woodchip things that sometimes spill and get all over your house, which is really annoying. That’s also okay because it’s worth it for the joy of cohabitating with this little fluffy rodent love balls. Comes with 3 miniature carrots for nibbling. +14,4,https://free-images.com/sm/1fd3/axolotl_ambystoma_mexicanum_aquarium_1.jpg,Axolotl,25,40,These creatures are crazy! They have the greatest tissue regeneration abilities known to science. They can regrow entire limbs and even regrow damaged brain tissue! They have evolved to never complete their metamorphosis, so they remain in a juvenile state throughout their lives, even reproducing while in this state. This is crazy! They are super weird. They also love to eat worms and they are fun to watch swim around! Remember to get a few little dark spaces for the tank so they can hide in the shadows. They love shadows. +15,5,https://free-images.com/sm/e5fc/cloud_sky_blue_clouds_5.jpg,cloud,5,1000,Get a pet cloud! Provided by mother nature. +16,2,https://free-images.com/sm/b1bf/hedgehog_spring_animal_548335.jpg,Hedgehog,45,2,Soft at heart +17,3,https://free-images.com/sm/e034/crocodile_tooth_reptile_dangerous_3.jpg,Crocodile,200,1,Rhinestone-encrusted collar included +18,4,https://free-images.com/sm/889f/golden_doodle_dog_forest.jpg,Golden-doodle,800,1,Extreme fluff situations +19,5,https://free-images.com/sm/2f30/wombat_photo.jpg,Wombat,100,3,Short-legged marsupial native to Australia diff --git a/db/seed_data/reviews.csv b/db/seed_data/reviews.csv new file mode 100644 index 0000000000..82b37e1e07 --- /dev/null +++ b/db/seed_data/reviews.csv @@ -0,0 +1,11 @@ +id,rating,user_id,product_id +1,4,1,4 +2,5,3,5 +3,1,5,6 +4,3,3,7 +5,4,2,8 +6,4,10,9 +7,5,4,10 +8,2,3,8 +9,1,5,4 +10,5,2,2 diff --git a/db/seed_data/users.csv b/db/seed_data/users.csv new file mode 100644 index 0000000000..c7da63385d --- /dev/null +++ b/db/seed_data/users.csv @@ -0,0 +1,11 @@ +id,uid,provider +1 +2,123456789,github +3,123456777,github +4 +5,111222555,github +6 +7 +8,222222555,github +9,333222555,github +10 diff --git a/db/seeds.rb b/db/seeds.rb new file mode 100644 index 0000000000..a327476c2f --- /dev/null +++ b/db/seeds.rb @@ -0,0 +1,144 @@ +require 'faker' +require 'csv' + +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.id = row['id'] + product.user_id = row['user_id'] + product.image_url = row['image_url'] + product.name = row['name'] + product.price = row['price'] + product.stock = row['stock'] + product.description = row['description'] + product.status = true + successful = product.save + if !successful + product_failures << product + puts "Failed to save product: #{product.inspect}" + else + puts "Created product: #{product.inspect}" + end +end + +puts "Added #{Product.count} product records" +puts "#{product_failures.length} products failed to save" + + + +USER_FILE = Rails.root.join('db', 'seed_data', 'users.csv') +puts "Loading raw user data from #{USER_FILE}" + +user_failures = [] +CSV.foreach(USER_FILE, :headers => true) do |row| + user = User.new + user.id = row['id'] + user.username = Faker::Cat.name + user.email = Faker::Internet.email + user.uid = row['uid'] + user.provider = row['provider'] + successful = user.save + if !successful + user_failures << user + puts "Failed to save user: #{user.inspect}" + else + puts "Created user: #{user.inspect}" + end +end + +puts "Added #{User.count} user records" +puts "#{user_failures.length} users failed to save" + +puts "Manually resetting PK sequence on each table" +ActiveRecord::Base.connection.tables.each do |t| + ActiveRecord::Base.connection.reset_pk_sequence!(t) +end + + +ORDERS_FILE = Rails.root.join('db', 'seed_data', 'orders.csv') +puts "Loading raw order data from #{ORDERS_FILE}" + +order_failures = [] +CSV.foreach(ORDERS_FILE, :headers => true) do |row| + order = Order.new + order.id = row['id'] + order.status = row['status'] + order.name_on_card = Faker::Name.name + order.cc_num = Faker::Number.number(4) # Integer of 16 digits can not be held here while the column is just an Interger.. it must be a big integer, or a string + order.cvv= Faker::Number.number(3) + order.email = Faker::Internet.email + order.street_address = Faker::Address.street_address + order.state = Faker::Address.state_abbr + order.city = Faker::Address.city + order.zip = Faker::Address.zip_code + successful = order.save + if !successful + order_failures << order + puts "Failed to save order: #{order.inspect}" + else + puts "Created order: #{order.inspect}" + end +end + +puts "Added #{Order.count} order records" +puts "#{order_failures.length} orders failed to save" + +CATEGORIES_FILE = Rails.root.join('db', 'seed_data', 'categories.csv') +puts "Loading raw categories data from #{CATEGORIES_FILE}" + +category_failures = [] +CSV.foreach(CATEGORIES_FILE, :headers => true) do |row| + category = Category.new + category.id = row['id'] + category.name = row['name'] + successful = category.save + if !successful + category_failures << category + puts "Failed to save categories: #{category.inspect}" + else + puts "Created category: #{category.inspect}" + end +end + +puts "Added #{Category.count} category records" +puts "#{category_failures.length} categories failed to save" + +## Commented out since reviews won't work until DB has been updated + +REVIEWS_FILE = Rails.root.join('db', 'seed_data', 'reviews.csv') +puts "Loading raw reviews data from #{REVIEWS_FILE}" + +review_failures = [] +CSV.foreach(REVIEWS_FILE, :headers => true) do |row| + review = Review.new + review.id = row['id'] + review.user_id = row['user_id'] + review.product_id = row['product_id'] + review.rating = row['rating'] + review.text_review = Faker::Lorem.sentence + successful = review.save + if !successful + review_failures << review + puts "Failed to save review: #{review.inspect}" + else + puts "Created review: #{review.inspect}" + end +end + +puts "Added #{Review.count} review records" +puts "#{review_failures.length} reviews failed to save" + + +# Since we set the primary key (the ID) manually on each of the +# tables, we've got to tell postgres to reload the latest ID +# values. Otherwise when we create a new record it will try +# to start at ID 1, which will be a conflict. +puts "Manually resetting PK sequence on each table" +ActiveRecord::Base.connection.tables.each do |t| + ActiveRecord::Base.connection.reset_pk_sequence!(t) +end + +puts "done" 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..c3862235f5 --- /dev/null +++ b/test/controllers/categories_controller_test.rb @@ -0,0 +1,87 @@ +require "test_helper" + +describe CategoriesController do + describe "index" do + it "succeeds when there are categories" do + Category.count.must_equal 3 + get categories_path + must_respond_with :success + end + + it "succeeds when there are no categories" do + Category.all.each do |item| + item.destroy + end + + Category.count.must_equal 0 + get categories_path + must_respond_with :success + end + end + + describe "new" do + it "succeeds" do + get new_category_path + must_respond_with :success + end + end + + describe "create" do + it "creates a product with valid data" do + Category.count.must_equal 3 + + user = users(:ada) + login(user, :github) + + category_params = { + name: "orange" + } + + Category.new(category_params).must_be :valid? + + post categories_path, params: {category: category_params} + must_respond_with :redirect + must_redirect_to user_path(user.id) + Category.count.must_equal 4 + end + + + it "does not create a product with invalid data" do + Category.count.must_equal 3 + user = users(:ada) + login(user, :github) + category_params = { + name: "" + } + + Category.new(category_params).wont_be :valid? + + post categories_path, params: {category: category_params} + must_respond_with :redirect + must_redirect_to user_path(user.id) + Category.count.must_equal 3 + end + end + + describe "show" do + it "shows a valid category" do + product = products(:dragon) + product.categories.length.must_equal 0 + + category = categories(:three) + product.categories << category + + category.products.length.must_equal 1 + + get category_path(category) + must_respond_with :success + end + + it "won's show invalid category" do + get category_path("carrot") + must_respond_with :redirect + must_redirect_to root_path + end + end + +end diff --git a/test/controllers/order_items_controller_test.rb b/test/controllers/order_items_controller_test.rb new file mode 100644 index 0000000000..39bea1b430 --- /dev/null +++ b/test/controllers/order_items_controller_test.rb @@ -0,0 +1,62 @@ +require "test_helper" +describe OrderItemsController do + + + describe "create" do + it "creates an order item with valid data for a real product and open order" do + product = products(:cat) + order = orders(:one) + + proc { + post order_items_path, params: { order_item: { product_id: product.id, order_id: order.id, quantity: 1 } } + }.must_change 'OrderItem.count', 1 + + must_respond_with :redirect + must_redirect_to new_order_path + end + + it "renders bad_request and does not update the DB for bogus data" do + + proc { + post order_items_path, params: { order_item: { product_id: nil } } + }.must_change 'OrderItem.count', 0 + + must_respond_with :bad_request + end + end + + describe "update" do + it "changes the quantity of the item in pending order" do + order = orders(:one) + product = products(:dog) + + item = OrderItem.create(product_id: product.id, order_id: order.id, quantity: 1) + + + proc { + put order_item_path(item.id), params: { quantity: { quantity: 3 } } + item = OrderItem.find(item.id) + }.must_change 'item.quantity', 2 + + + must_respond_with :redirect + must_redirect_to new_order_path + end + end + + describe "destroy" do + it "succeeds for an extant order item ID" do + item = order_items(:one) + proc { + delete order_item_path(item.id)}.must_change 'OrderItem.count', -1 + end + + it "renders 404 not_found and does not update the DB for a bogus order item ID" do + proc { + delete order_item_path('abc')}.must_change 'OrderItem.count', 0 + + must_respond_with :bad_request + end + + end +end diff --git a/test/controllers/orders_controller_test.rb b/test/controllers/orders_controller_test.rb new file mode 100644 index 0000000000..1f46b95afc --- /dev/null +++ b/test/controllers/orders_controller_test.rb @@ -0,0 +1,120 @@ +require "test_helper" +require 'pry' + +describe OrdersController do + + describe "index" do + + it "should get index" do + get orders_path + must_respond_with :success + end + + it "succeeds with no orders" do + + orders = Order.all + orders.destroy_all + + get orders_path + + must_respond_with :success + end + end + + + describe "new" do + it "succeeds" do + get new_order_path + must_respond_with :success + end + end + + + + describe "update" do + it "updates an order with valid data" do + new_order = orders(:one) + + order_info = { + name_on_card: "Bunny", + cc_num: "1234123412341234", + cvv: 121, + email: "hello@hi.org", + street_address: "111 Candy Cane Lane", + state: "NP", + city: "Santa", + zip: 54321, + status: "paid" + } + + proc { + put order_path(new_order.id), params: { order: order_info } + }.must_change 'Order.where(status: "paid").count', 1 + + placed_order = Order.find_by(cc_num: 1234123412341234) + + placed_order.status.must_equal "paid" + must_respond_with :redirect + must_redirect_to order_path(placed_order.id) + end + + it "renders bad_request and does not update the DB for bogus data" do + order = orders(:one) + + bad_order_hash = { + name_on_card: nil, + } + + proc { + put order_path(order.id), params: { order: bad_order_hash } + }.must_change 'Order.where(status: "paid").count', 0 + + must_respond_with :bad_request + end + + it "reduces the quantity of each product on the order" do + order = Order.create(status: "pending") + + product = products(:cat) + + item = OrderItem.new(product_id: product.id, order_id: order.id, quantity: 2) + item.save + + order_info = { + name_on_card: "Bunny", + cc_num: "1234123412341234", + cvv: 121, + email: "hello@hi.org", + street_address: "111 Candy Cane Lane", + state: "NP", + city: "Santa", + zip: 54321, + status: "paid" + } + + proc { + put order_path(order.id), params: { order: order_info } + product = Product.find(item.product_id) + }.must_change 'product.stock', -2 + + + end + end + + + describe "show" do + it "succeeds for an extant order ID" do + order = orders(:one) + + get order_path(order.id) + must_respond_with :success + + end + + it "renders 404 not_found for a bogus order ID" do + get order_path("abc") + must_respond_with :not_found + end + end + +end diff --git a/test/controllers/product.rb b/test/controllers/product.rb new file mode 100644 index 0000000000..71a1daa404 --- /dev/null +++ b/test/controllers/product.rb @@ -0,0 +1,38 @@ +class Product < ApplicationRecord + has_and_belongs_to_many :categories + has_many :order_items + has_many :orders, through: :order_items + has_many :reviews + + # validates :user_id, presence: true + + 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} + + def average_rating + return reviews.average(:rating).to_i + end + + def self.by_category(category) + assigned = Product.where.not(category: []) + selected = assigned.select {|product| product.categories.include?(id)} + + return selected + end + + def self.by_merchant(id) + return Product.where(user_id: id) + end + + + def change_stock(quantity) + total = self.stock + number = total - quantity + self.stock = number + self.save + + end + + +end diff --git a/test/controllers/products_controller_test.rb b/test/controllers/products_controller_test.rb new file mode 100644 index 0000000000..f5c9b6d0ec --- /dev/null +++ b/test/controllers/products_controller_test.rb @@ -0,0 +1,135 @@ +require "test_helper" +require "pry" + +describe ProductsController do + describe "index" do + it "succeeds when there are works" do + Product.count.must_equal 3 + get products_path + must_respond_with :success + end + + it "succeeds when there are no works" do + Product.all.each do |item| + item.destroy + end + + Product.count.must_equal 0 + get products_path + must_respond_with :success + end + end + + describe "show" do + it "succeeds" do + get product_path(products(:cat)) + must_respond_with :success + end + + # it "redirects if not in db" do + # get product_path(nil) + # must_redirect_to products_path + # end + end + + describe "new" do + it "succeeds" do + user = users(:ada) + get new_user_product_path(user.id) + must_respond_with :success + end + end + + describe "create" do + it "creates a product with valid data" do + Product.count.must_equal 3 + user = users(:ada) + + post user_products_path(user.id), params: { + product: { + name: "Bunny", + stock: 14, + price: 5, + description: "Too many, please help", + status: true, + user_id: user.id, + image_url: "www.test-URL.com", + categories: [categories(:one)] + } + } + Product.count.must_equal 4 + must_respond_with :redirect + must_redirect_to products_path + end + + it "won't create invalid product" do + proc { + user = users(:ada) + + post user_products_path(user.id), params: { + product: { + stock: 14, + price: 5, + description: "Too many, please help", + status: true, + user_id: user.id, + image_url: "www.test-URL.com" + } + } + }.must_change "Product.count", 0 + + Product.count.must_equal 3 + end + end + + describe "edit" do + it "succeeds for an extant product ID" do + get edit_user_product_path(users(:ada).id, products(:dragon).id,) + must_respond_with :success + end + + # it "renders 404 not_found for a bogus work ID" do + # get edit_product_path("carrot") + # must_respond_with :not_found + # end + + end + + describe "update" do + it "succeeds for valid data and an extant work ID" do + updated_name = "Donkey" + + patch user_product_path(users(:ada).id, products(:dragon).id), params: { + product: { + name: "Donkey" + } + } + + updated_product = Product.find(products(:dragon).id) + updated_product.name.must_equal updated_name + must_respond_with :redirect + end + + # it "renders bad_request for bogus data" do + # product = products(:dragon) + # put product_path(product.id), params: { + # product: { + # name: "" + # } + # } + # + # product.name.must_equal "Norweigan Ridgeback" + # end + + + # it "renders 404 not_found for a bogus product ID" do + # put product_path(products(:dragon).id), params: { + # product: { + # id: "deeface" + # } + # } + # must_respond_with :not_found + # end + end + +end diff --git a/test/controllers/reviews_controller_test.rb b/test/controllers/reviews_controller_test.rb new file mode 100644 index 0000000000..cbb826a5ff --- /dev/null +++ b/test/controllers/reviews_controller_test.rb @@ -0,0 +1,58 @@ +require "test_helper" + +describe ReviewsController do + describe "new" do + it "returns success when making a new review" do + get new_product_review_path(Product.first.id) + + must_respond_with :success + end + + it "returns not found when making a review to product doesn't exists" do + get new_product_review_path(Product.last.id + 1) + must_respond_with :not_found + end + end + + describe "create" do + it "redirects to product's page when saving a review" do + Review.count.must_equal 2 + proc { + post product_reviews_path(products(:dog).id), params: { + review: { + text_review: "This is another review that will be created", + rating: 2, + product_id: products(:dog).id + } + } + }.must_change "Review.count", 1 + + must_respond_with :redirect + must_redirect_to product_path(products(:dog).id) + end + + it "sends bad_request when the review data is bogus" do + # Arrange + invalid_review_data = { + review: { + #invalid rating, rating should be between 0 and 5 + rating: 15, + product_id: Product.first.id + } + } + # Double check the data is truly invalid + Review.new(invalid_review_data[:review]).wont_be :valid? + + start_review_count = Review.count + + # Act + post product_reviews_path(invalid_review_data[:review][:product_id]), params: invalid_review_data + + # Assert + must_respond_with :bad_request + Review.count.must_equal start_review_count + end + + end + +end diff --git a/test/controllers/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb new file mode 100644 index 0000000000..6109751716 --- /dev/null +++ b/test/controllers/sessions_controller_test.rb @@ -0,0 +1,28 @@ +require "test_helper" +require 'pry' +describe SessionsController do + + it "logs in an existing user and redirect to root_path" do + user = users(:ada) + start_count = User.count + login(user, :github) + User.count.must_equal start_count + must_redirect_to root_path + session[:user_id].must_equal user.id + end + + it "must have a username" do + user = users(:ada) + login(user, :github) + user.username.must_equal "countess_ada" + end + + it "clears the session and redirects back to the root path when a merchant logs out" do + user = users(:ada) + login(user, :github) + delete logout_path + session[:user_id].must_equal nil + must_redirect_to root_path + end + +end diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb new file mode 100644 index 0000000000..4ca0949d13 --- /dev/null +++ b/test/controllers/users_controller_test.rb @@ -0,0 +1,51 @@ +require "test_helper" + +describe UsersController do + describe "index" do + + it "should get index" do + get users_path + must_respond_with :success + end + + it "succeeds with no users" do + users(:ada).destroy + users(:grace).destroy + users(:gretchen).destroy + + users.count.must_equal 0 + + end + end + + describe "show" do + it "should get show" do + id = users(:ada).id + get users_path(id) + + must_respond_with :success + end + end + + describe "update" do + it "changes user information" do + updated_username = "CandyCanes111" + put user_path(users(:grace).id), params: { user: { username: updated_username} } + + updated_user = User.find(users(:grace).id) + updated_user.username.must_equal "CandyCanes111" + end + + it "will not change username to one that already exists" do + updated_username = users(:grace).username + initial_username = users(:ada).username + + put user_path(users(:ada).id), params: { user: { username: updated_username} } + + updated_user = User.find(users(:ada).id) + updated_user.username.must_equal initial_username + + 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/categories.yml b/test/fixtures/categories.yml new file mode 100644 index 0000000000..0d5d28db3f --- /dev/null +++ b/test/fixtures/categories.yml @@ -0,0 +1,8 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: cats +two: + name: dogs +three: + name: exotic diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/fixtures/order_items.yml b/test/fixtures/order_items.yml new file mode 100644 index 0000000000..1fce0fff92 --- /dev/null +++ b/test/fixtures/order_items.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + quantity: 1 + order: one + product: cat + +two: + quantity: 1 + order: two + product: dog diff --git a/test/fixtures/orders.yml b/test/fixtures/orders.yml new file mode 100644 index 0000000000..079cd8d93e --- /dev/null +++ b/test/fixtures/orders.yml @@ -0,0 +1,23 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + status: pending + name_on_card: Ada Lovelace + cc_num: 1234 + cvv: 123 + email: ada@adadevelopersacademy.org + street_address: 123 Pine Street + state: WA + city: Seattle + zip: 98104 + +two: + status: paid + name_on_card: Gretchen Greps + cc_num: 4321 + cvv: 321 + email: gretchen@adadevelopersacademy.org + street_address: 321 Pike street + state: WA + city: Seattle + zip: 98122 diff --git a/test/fixtures/products.yml b/test/fixtures/products.yml new file mode 100644 index 0000000000..2ddada46cc --- /dev/null +++ b/test/fixtures/products.yml @@ -0,0 +1,26 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +cat: + name: British Short-Hair + stock: 4 + price: 500 + description: Excellent company on a rainy day + status: true + user_id: ada.id + image_url: https://placebear.com/g/500/400 +dog: + name: Cavalier King Charles Spaniel + stock: 2 + price: 2750 + description: Each and every one is a unique princess + status: false + user_id: grace.id + image_url: https://placebear.com/g/500/400 +dragon: + name: Norweigan Ridgeback + stock: 1 + price: 25000 + description: Very Rare; in excellent health + status: true + user_id: gretchen.id + image_url: https://placebear.com/g/500/400 diff --git a/test/fixtures/reviews.yml b/test/fixtures/reviews.yml new file mode 100644 index 0000000000..1c2321ebdd --- /dev/null +++ b/test/fixtures/reviews.yml @@ -0,0 +1,12 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + rating: 1 + product: dragon + user: ada + text_review: This dragon is a cute dragon +two: + rating: 1 + product: dragon + user: gretchen + text_review: This is the loudest pet I have ever owned. It burned my house down. diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml new file mode 100644 index 0000000000..9ca2cfb381 --- /dev/null +++ b/test/fixtures/users.yml @@ -0,0 +1,22 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +ada: + provider: github + uid: 12345 + email: ada@adadevelopersacademy.org + username: countess_ada +grace: + provider: github + uid: 13371337 + email: grace@hooper.net + username: graceful_hoops +gretchen: + provider: github + uid: 9999089 + email: gretchen@adadevelopersacademy.org + username: gigi +lily: + provider: github + uid: 999978 + email: lily@adadevelopersacademy.org + username: lillerz 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/category_test.rb b/test/models/category_test.rb new file mode 100644 index 0000000000..781320ad8e --- /dev/null +++ b/test/models/category_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Category do + let(:category) { Category.new } + + it "must be valid" do + value(category).must_be :valid? + end +end diff --git a/test/models/order_item_test.rb b/test/models/order_item_test.rb new file mode 100644 index 0000000000..9b8a879914 --- /dev/null +++ b/test/models/order_item_test.rb @@ -0,0 +1,29 @@ +require "test_helper" + +describe OrderItem do + let(:order_item) { OrderItem.new(product_id: products(:cat).id, order_id: orders(:one).id, quantity: 1) } + + it "must be valid" do + value(order_item).must_be :valid? + end + + describe "get subtotal" do + it "returns correct subtotal for quantity" do + order = orders(:one) + product = products(:cat) + order_item.quantity = 3 + sum = product.price * 3 + + order_item.get_subtotal.must_equal sum + end + end + + describe "already_exists" do + it "returns true if product is already in pending order" do + order = orders(:one) + second = OrderItem.new(product_id: products(:cat).id, order_id: orders(:one).id, quantity: 2) + + second.already_exists?.must_equal true + end + end +end diff --git a/test/models/order_test.rb b/test/models/order_test.rb new file mode 100644 index 0000000000..44020f1076 --- /dev/null +++ b/test/models/order_test.rb @@ -0,0 +1,41 @@ +require "test_helper" + +describe Order do + + describe "get total" do + it "returns order total" do + order = orders(:one) + existing_item = order.order_items.first + existing_item.destroy + + product1 = products(:cat) + product2 = products(:dog) + item1 = OrderItem.create(product_id: product1.id, order_id: order.id, quantity: 1) + item2 = OrderItem.create(product_id: product2.id, order_id: order.id, quantity: 1) + + sum = product1.price + product2.price + + order.get_total.must_equal sum + end + end + + describe "merchant products" do + it "returns a list of the merchant's products" do + merchant = users(:ada) + product1 = products(:cat) + product1.update(user_id: merchant.id) + product2 = products(:dog) + product2.update(user_id: merchant.id) + + merchant_product = merchant.products.length + merchant_product.must_equal 2 + end + + it "doesn't return any product if merchant has zero" do + merchant = users(:ada) + + Order.merchant_products(merchant.id).must_be_empty + end + end + +end diff --git a/test/models/product_test.rb b/test/models/product_test.rb new file mode 100644 index 0000000000..5996bcdc30 --- /dev/null +++ b/test/models/product_test.rb @@ -0,0 +1,173 @@ +require "test_helper" + +describe Product do + describe "validations" do + before do + @product = products(:dog) + end + + describe "price" do + it "has a price" do + @product.price.must_equal 2750.00 + end + + + it "must have a valid price" do + @product.price = 0 + @product.valid?.must_equal false + end + end + + describe "name" do + it "must have a name" do + @product.name.must_equal "Cavalier King Charles Spaniel" + end + + it "must have a valid name" do + @product.name = "" + @product.valid?.must_equal false + end + end + + describe "stock" do + it "must be a number" do + @product.stock = "c" + @product.valid?.must_equal false + end + + it "can be equal to 0" do + @product.stock = 0 + @product.valid?.must_equal true + end + + it "must not be less than 0" do + @product.stock = -2 + @product.valid?.must_equal false + end + end + end + + describe "relations" do + before do + @product = products(:dragon) + end + + describe "reviews" do + it "responds to reviews with no reviews" do + a = products(:dog) + a.reviews.count.must_equal 0 + end + + it "responds to reviews" do + @product.reviews.count.must_equal 2 + end + + it "can register new reviews" do + Review.create({ + text_review: "This is another review that will be created", + rating: 2, + product_id: @product.id, + user_id: users(:ada) + }) + + @product.reviews.count.must_equal 3 + end + end + + describe "categories" do + it "responds to categories with no categories added" do + @product.categories.length.must_equal 0 + end + + it "responds to categories with added categories" do + @product.categories << categories(:three) + @product.categories.length.must_equal 1 + end + end + end + + describe "methods" do + describe "by_category" do + it "returns an empty array if category has no items" do + Product.by_category(categories(:one)).length.must_equal 0 + Product.by_category(categories(:one)).must_equal [] + end + + it "returns an item assigned to a category" do + product = products(:cat) + product.categories << categories(:one) + product.categories << categories(:three) + + product.categories.must_include categories(:one) + + filtered = Product.by_category(categories(:one)) + + filtered.length.must_equal 1 + filtered.first.name.must_equal product.name + end + + it "returns multiple items assigned to a category" do + Product.by_category(categories(:three)).must_equal [] + + product_1 = products(:cat) + product_2 = products(:dragon) + product_1.categories << categories(:three) + product_2.categories << categories(:three) + + filtered = Product.by_category(categories(:three)) + + filtered.length.must_equal 2 + end + end + + describe "by_merchant" do #is this method redundant? + before do + @user = users(:lily) + end + it "returns an empty array if merchant has no items" do + @user.products.must_equal [] + Product.by_merchant(@user.id).must_equal [] + end + + it "returns an item assigned to a user" do + data = { + name: "Bunny", + stock: 14, + price: 5, + description: "Too many, please help", + status: true, + user_id: @user.id, + image_url: "www.test-URL.com" + } + + Product.create(data) + Product.by_merchant(@user.id).length.must_equal 1 + end + + it "returns multiple items assigned to a category" do + + Product.create({ + name: "Jaguar", + stock: 2, + price: 500, + description: "Excellent", + status: true, + user_id: @user.id, + image_url: "https://placebear.com/g/500/400" + }) + + Product.create({ + name: "Bunny", + stock: 14, + price: 5, + description: "Too many, please help", + status: true, + user_id: @user.id, + image_url: "www.test-URL.com" + }) + + Product.by_merchant(@user.id).length.must_equal 2 + end + end + end +end diff --git a/test/models/review_test.rb b/test/models/review_test.rb new file mode 100644 index 0000000000..df782c302c --- /dev/null +++ b/test/models/review_test.rb @@ -0,0 +1,42 @@ +require "test_helper" + +describe Review do + let(:review) { reviews(:one) } + + describe "#valid?" do + + it "should return false without a rating" do + review.rating = nil + review.valid?.must_equal false + end + + it "should return false if rating is not between 1 and 5" do + review.rating = 6 + review.valid?.must_equal false + end + + it "should return false if rating is a letter" do + review.rating = "b" + review.valid?.must_equal false + end + + it "should no more than 500 character" do + + review.text_review = "Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibusAenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus" + review.valid?.must_equal false + + end + end + + describe "#product" do + it "should return the associated product" do + review.product.must_equal products(:dragon) + end + + it "should return the correct number of reviews" do + products(:dragon).reviews.count.must_equal 2 + end + end + + +end diff --git a/test/models/user_test.rb b/test/models/user_test.rb new file mode 100644 index 0000000000..d378d8530c --- /dev/null +++ b/test/models/user_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe User do + + + it "must be valid" do + value(users(:ada)).must_be :valid? + 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..49f55b39e2 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,55 @@ +require 'simplecov' +SimpleCov.start +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails" +require "minitest/reporters" # for Colorized output + + +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + + def setup + OmniAuth.config.test_mode = true + end + + def login(user, provider) + OmniAuth.config.mock_auth[provider] = OmniAuth::AuthHash.new(mock_auth_hash(user)) + get auth_callback_path(provider) + + end + def logout(user, provider) + OmniAuth.config.mock_auth[provider] = OmniAuth::AuthHash.new(mock_auth_hash(user)) + delete auth_callback_path(provider) + + end + + def mock_auth_hash(user) + return { + provider: user.provider, + uid: user.uid, + info: { + email: user.email, + nickname: user.username + } + } + end +end + # Add more helper methods to be used by all tests here... 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