Ada-C5 · digivava · May 2, 2016 · May 2, 2016 · May 2, 2016 · May 3, 2016
diff --git a/Gemfile b/Gemfile
@@ -24,13 +24,22 @@ gem 'jbuilder', '~> 2.0'
 gem 'sdoc', '~> 0.4.0', group: :doc
 
 # Use ActiveModel has_secure_password
-# gem 'bcrypt', '~> 3.1.7'
+gem 'bcrypt', '~> 3.1.7'
 
 # Use Unicorn as the app server
 # gem 'unicorn'
 
 # Use Capistrano for deployment
 # gem 'capistrano-rails', group: :development
+# Testing
+
+group :test do
+  gem 'minitest'
+  gem 'minitest-reporters'
+  gem 'simplecov', require: false
+end
+
+  gem 'pretty_time', '~> 0.2.2'
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
@@ -40,8 +49,15 @@ end
 group :development do
   # Access an IRB console on exception pages or by using <%= console %> in views
   gem 'web-console', '~> 2.0'
+  gem 'better_errors'
+  gem 'pry-rails'
+  gem 'binding_of_caller'
+  gem 'rails-erd'
 
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring'
 end
 
+group :production do
+  gem 'rails_12factor'
+end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -36,11 +36,19 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
+    ansi (1.5.0)
     arel (6.0.3)
+    bcrypt (3.1.11)
+    better_errors (2.1.1)
+      coderay (>= 1.0.0)
+      erubis (>= 2.6.6)
+      rack (>= 0.9.0)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
     builder (3.2.2)
     byebug (8.2.5)
+    choice (0.2.0)
+    coderay (1.1.1)
     coffee-rails (4.1.1)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.1.x)
@@ -50,10 +58,12 @@ GEM
     coffee-script-source (1.10.0)
     concurrent-ruby (1.0.1)
     debug_inspector (0.0.2)
+    docile (1.1.5)
     erubis (2.7.0)
     execjs (2.6.0)
     globalid (0.3.6)
       activesupport (>= 4.1.0)
+    hashie (3.4.4)
     i18n (0.7.0)
     jbuilder (2.4.1)
       activesupport (>= 3.0.0, < 5.1)
@@ -67,15 +77,30 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
+    method_source (0.8.2)
     mime-types (3.0)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0221)
     mini_portile2 (2.0.0)
     minitest (5.8.4)
+    minitest-reporters (1.0.2)
+      ansi
+      builder
+      minitest (>= 5.0)
+      powerbar
     multi_json (1.11.3)
     nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
     pg (0.18.4)
+    powerbar (1.0.17)
+      hashie (>= 1.1.0)
+    pretty_time (0.2.2)
+    pry (0.10.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-rails (0.3.4)
+      pry (>= 0.9.10)
     rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -96,8 +121,18 @@ GEM
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
+    rails-erd (1.4.7)
+      activerecord (>= 3.2)
+      activesupport (>= 3.2)
+      choice (~> 0.2.0)
+      ruby-graphviz (~> 1.2)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
+    rails_12factor (0.0.3)
+      rails_serve_static_assets
+      rails_stdout_logging
+    rails_serve_static_assets (0.0.5)
+    rails_stdout_logging (0.0.5)
     railties (4.2.6)
       actionpack (= 4.2.6)
       activesupport (= 4.2.6)
@@ -106,6 +141,7 @@ GEM
     rake (11.1.2)
     rdoc (4.2.2)
       json (~> 1.4)
+    ruby-graphviz (1.2.2)
     sass (3.4.22)
     sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)
@@ -116,6 +152,12 @@ GEM
     sdoc (0.4.1)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    slop (3.6.0)
     spring (1.7.1)
     sprockets (3.6.0)
       concurrent-ruby (~> 1.0)
@@ -143,18 +185,31 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  bcrypt (~> 3.1.7)
+  better_errors
+  binding_of_caller
   byebug
   coffee-rails (~> 4.1.0)
   jbuilder (~> 2.0)
   jquery-rails
+  minitest
+  minitest-reporters
   pg (~> 0.15)
+  pretty_time (~> 0.2.2)
+  pry-rails
   rails (= 4.2.6)
+  rails-erd
+  rails_12factor
   sass-rails (~> 5.0)
   sdoc (~> 0.4.0)
+  simplecov
   spring
   turbolinks
   uglifier (>= 1.3.0)
   web-console (~> 2.0)
 
+RUBY VERSION
+   ruby 2.3.0p0
+
 BUNDLED WITH
    1.12.1
diff --git a/app/assets/images/airbeyonce.JPG b/app/assets/images/airbeyonce.JPG
diff --git a/app/assets/images/beachwave-extension.jpg b/app/assets/images/beachwave-extension.jpg
diff --git a/app/assets/images/becoming-beyonce.jpg b/app/assets/images/becoming-beyonce.jpg
diff --git a/app/assets/images/bee-costume.jpg b/app/assets/images/bee-costume.jpg
diff --git a/app/assets/images/beecool.jpg b/app/assets/images/beecool.jpg
diff --git a/app/assets/images/beeshack.jpg b/app/assets/images/beeshack.jpg
diff --git a/app/assets/images/beevenom.jpg b/app/assets/images/beevenom.jpg
diff --git a/app/assets/images/beeyonce_erd.jpg b/app/assets/images/beeyonce_erd.jpg
diff --git a/app/assets/images/bey-hive.jpg b/app/assets/images/bey-hive.jpg
diff --git a/app/assets/images/beyonce-albums.jpg b/app/assets/images/beyonce-albums.jpg
diff --git a/app/assets/images/beyonce-barbie.jpg b/app/assets/images/beyonce-barbie.jpg
diff --git a/app/assets/images/beyonce-heat.jpg b/app/assets/images/beyonce-heat.jpg
diff --git a/app/assets/images/beyonce-sticker.jpg b/app/assets/images/beyonce-sticker.jpg
diff --git a/app/assets/images/beyonces-tears.png b/app/assets/images/beyonces-tears.png
diff --git a/app/assets/images/comingsoon.png b/app/assets/images/comingsoon.png
diff --git a/app/assets/images/honeycomb-bg.jpg b/app/assets/images/honeycomb-bg.jpg
diff --git a/app/assets/images/honeycomb-comb.jpg b/app/assets/images/honeycomb-comb.jpg
diff --git a/app/assets/images/larvae.jpeg b/app/assets/images/larvae.jpeg
diff --git a/app/assets/images/lemonade.jpg b/app/assets/images/lemonade.jpg
diff --git a/app/assets/images/lipbalm.jpg b/app/assets/images/lipbalm.jpg
diff --git a/app/assets/images/pixy-stix.jpg b/app/assets/images/pixy-stix.jpg
diff --git a/app/assets/images/royal-jelly.jpg b/app/assets/images/royal-jelly.jpg
diff --git a/app/assets/images/stinger.jpg b/app/assets/images/stinger.jpg
diff --git a/app/assets/images/toothpaste.jpg b/app/assets/images/toothpaste.jpg
diff --git a/app/assets/images/wasp-plush.jpg b/app/assets/images/wasp-plush.jpg
diff --git a/app/assets/javascripts/categories.coffee b/app/assets/javascripts/categories.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/javascripts/order_items.coffee b/app/assets/javascripts/order_items.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/javascripts/orders.coffee b/app/assets/javascripts/orders.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/javascripts/products.coffee b/app/assets/javascripts/products.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/javascripts/reviews.coffee b/app/assets/javascripts/reviews.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/javascripts/sessions.coffee b/app/assets/javascripts/sessions.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/javascripts/users.coffee b/app/assets/javascripts/users.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -0,0 +1,120 @@
+html {
+  /* because bootstrap apparently messes with this */
+  font-size: 16px;
+}
+
+body {
+  background-image: asset-url('honeycomb-bg.jpg');
+}
+
+a {
+  color: black;
+  text-decoration: underline;
+}
+
+ul {
+  list-style-type: none;
+}
+
+h1.main-title {
+  font-size: 6rem;
+  font-family: 'Sacramento', cursive;
+  text-align: center;
+}
+
+.topnav {
+  text-align: center;
+}
+
+.topnav a {
+  font-size: 2.5rem;
+  font-family: 'Sacramento', cursive;
+  margin: 2rem;
+}
+
+.greeting {
+  font-size: 1.5rem;
+  text-align: center;
+}
+
+.bottomnav {
+  text-align: center;
+}
+
+.search {
+  text-align: center;
+}
+
+.nothinghere {
+  font-size: 2rem;
+  text-align: center;
+}
+
+.bottomnav a {
+  font-size: 1.5rem;
+  font-family: 'Sacramento', cursive;
+  margin: 2rem;
+}
+
+.fancylink {
+  font-family: 'Sacramento', cursive;
+  font-size: 2rem;
+}
+
+.container ul {
+  display: inline;
+}
+
+.thumbnail li {
+  text-align: center;
+  display: block;
+}
+
+.caption a {
+  font-size: 1.5rem;
+}
+
+.caption a:hover {
+  color: yellow;
+}
+
+.price {
+  display: block;
+  font-size: 1.25rem;
+  font-family: 'Sacramento', cursive;
+  font-weight: bold;
+}
+
+a.merchantname {
+  font-size: 1rem;
+}
+
+form.productsearch {
+  font-size: 2rem;
+}
+
+input[type=submit] {
+    padding:2px 5px;
+    background:lightgray;
+    border:1px lightgray solid;
+    cursor:pointer;
+    -webkit-border-radius: 5px;
+    border-radius: 5px;
+    font-size: 1rem;
+}
+
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the bottom of the
+ * compiled file so the styles you add here take precedence over styles defined in any styles
+ * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
+ * file per style scope.
+ *
+ *= require_tree .
+ *= require_self
+ */
diff --git a/app/assets/stylesheets/categories.scss b/app/assets/stylesheets/categories.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the categories controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/order_items.scss b/app/assets/stylesheets/order_items.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the OrderItems controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/orders.scss b/app/assets/stylesheets/orders.scss
@@ -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/products.scss b/app/assets/stylesheets/products.scss
@@ -0,0 +1,5 @@
+// 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/
+
+/*** INDEX ***/
diff --git a/app/assets/stylesheets/reviews.scss b/app/assets/stylesheets/reviews.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the Reviews controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/sessions.scss b/app/assets/stylesheets/sessions.scss
@@ -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/sessions.scss~HEAD b/app/assets/stylesheets/sessions.scss~HEAD
@@ -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/users.scss b/app/assets/stylesheets/users.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the Users controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -2,4 +2,16 @@ class ApplicationController < ActionController::Base
   # Prevent CSRF attacks by raising an exception.
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception
+  helper_method :current_user
+
+  def current_user
+    @user ||= User.find_by(id: session[:user_id])
+  end
+
+  # def require_login
+  #   if current_user.nil?
+  #     flash[:error] = "You must be logged in to view this section"
+  #     redirect_to login_path
+  #   end
+  # end
 end