Ditzy Pull Request

.gitignore

@@ -5,11 +5,19 @@
 #   git config --global core.excludesfile '~/.gitignore_global'
 
 # Ignore bundler config.
+
+
+.DS_Store
+
+coverage
+
 /.bundle
 
+# Ignore the default SQLite database.
+/db/*.sqlite3
+/db/*.sqlite3-journal
+
 # Ignore all logfiles and tempfiles.
 /log/*
 !/log/.keep
-/tmp
-
-.DS_Store
+/tmp

Gemfile

@@ -11,6 +11,8 @@ gem 'sass-rails', '~> 5.0'
 gem 'uglifier', '>= 1.3.0'
 # Use CoffeeScript for .coffee assets and views
 gem 'coffee-rails', '~> 4.1.0'
+
+gem 'bootstrap-sass'
 # See https://github.com/rails/execjs#readme for more supported runtimes
 # gem 'therubyracer', platforms: :ruby
 
@@ -24,7 +26,7 @@ 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'
@@ -35,6 +37,8 @@ gem 'sdoc', '~> 0.4.0', group: :doc
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug'
+  gem 'simplecov'
+  gem 'rails-erd'
 end
 
 group :development do

Gemfile.lock

@@ -37,10 +37,17 @@ GEM
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     arel (6.0.3)
+    autoprefixer-rails (6.3.6)
+      execjs
+    bcrypt (3.1.11)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
+    bootstrap-sass (3.3.6)
+      autoprefixer-rails (>= 5.2.1)
+      sass (>= 3.3.4)
     builder (3.2.2)
     byebug (8.2.5)
+    choice (0.2.0)
     coffee-rails (4.1.1)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.1.x)
@@ -50,6 +57,7 @@ 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)
@@ -96,6 +104,11 @@ 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)
     railties (4.2.6)
@@ -106,6 +119,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 +130,11 @@ GEM
     sdoc (0.4.1)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
+    simplecov (0.11.2)
+      docile (~> 1.1.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
     spring (1.7.1)
     sprockets (3.6.0)
       concurrent-ruby (~> 1.0)
@@ -143,18 +162,25 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  bcrypt (~> 3.1.7)
+  bootstrap-sass
   byebug
   coffee-rails (~> 4.1.0)
   jbuilder (~> 2.0)
   jquery-rails
   pg (~> 0.15)
   rails (= 4.2.6)
+  rails-erd
   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

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/

app/assets/javascripts/order_item.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/

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/

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/

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/

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/

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/

app/assets/stylesheets/application.css.scss

@@ -0,0 +1,106 @@
+/** MAIN STYLING **/
+
+@import "bootstrap-sprockets";
+@import "bootstrap";
+
+* {
+  box-sizing: border-box;
+}
+
+html {
+  font-family: 'Palanquin', sans-serif;
+  font-size: 1rem;
+}
+
+main {
+  padding: 1rem;
+}
+
+h1 {
+  color: #42bad3; /* ditzy bright blue */
+  font-weight: lighter;
+  font-size: 2.5rem;
+  padding: 1rem;
+  margin: 0rem;
+}
+
+h2 {
+    color: #d8563d; /* ditzy red */
+    font-size: 1.5rem;
+    padding: 1rem;
+}
+
+h3 {
+  color: #42bad3; /* ditzy bright blue */
+  font-size: 1.5rem;
+  padding: 1rem;
+}
+
+h4 { 
+
+  color: #3f52b8; /* ditzy dark blue */
+  font-size: 1.5rem;
+  padding: 1rem;
+
+}
+
+span {
+  color: #3f52b8; /* ditzy dark blue */
+}
+
+a {
+  color: #3f52b8; /* ditzy dark blue */
+}
+
+p {
+  color: #3f52b8;  /* ditzy dark blue */
+  font-size: 1rem;
+  padding: 1rem;
+}
+
+li { 
+  color: #42bad3; /* ditzy bright blue */ 
+  list-style-type: circle; 
+ }
+
+
+hr.dark-blue {
+  border: 0.1rem solid #3f52b8;
+  padding: 0rem;
+  margin: 0rem;
+}
+
+hr.bright-blue {
+  border: 0.1rem solid #42bad3;
+  padding: 0rem;
+  margin: 0rem;
+}
+
+.thumnbnail {
+  display: inline-block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.caption {
+  display: inline-block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.caption p {
+  font-size: 0.8rem;
+  margin: 0;
+}
+
+.btn {
+  margin-left: 0.5rem;
+}
+
+/** FONT AWESOME **/
+
+.fa {
+  color: #3f52b8; /* ditzy dark blue */
+  font-size: 3rem !important;
+}
+

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/

app/assets/stylesheets/order_item.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the OrderItem controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

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/

app/assets/stylesheets/products.scss

@@ -0,0 +1,3 @@
+// 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/

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/

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/

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/

app/controllers/application_controller.rb

@@ -2,4 +2,18 @@ class ApplicationController < ActionController::Base
   # Prevent CSRF attacks by raising an exception.
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception
-end
+  helper_method :current_user
+
+  def current_user
+    @user ||= User.find_by(id: session[:user_id])
+  end
+
+  def index
+    redirect_to products_path
+  end
+
+  # def logged_in?
+  #   current_user != nil
+  # end
+
+end

app/controllers/categories_controller.rb

@@ -0,0 +1,50 @@
+class CategoriesController < ApplicationController
+
+  # we could use this to run a clickable list of categories that will enable folks to see what all the categories are.
+  def index
+  end
+
+  def show_by_category
+    @merchant = User.find(params[:id])
+    @products = Product.where(user_id: @merchant.id)
+
+    render :categories_products
+  end
+  #   if merchant && merchant.authenticate(params[:password])
+  #       merchant_session[:merchant_id] = merchant.id
+  #       redirect_to root_url, :notice => "Merchanthas been logged in"
+  #   else
+  #       flash.now[:error] = "Invalid username or password."
+  #       @title  = "Merchant Signin"
+  #       render "new"
+  #   end
+  def new
+    @category = Category.new
+  end
+
+  def create
+    # if category_create_params[:category][:name] == ""
+    #   flash.now[:error] = "Please Enter a Catagory Name"
+    #   raise
+    # end
+    @category = Category.new(category_create_params[:category])
+    if @category.save
+      redirect_to dashboard_path(current_user.id)
+    else
+      # this sucks - place holder for the moment
+      render :bad_route
+
+      # redirect_to dashboard_path(current_user.id) 
+    end
+  end
+
+  private
+  def category_create_params
+    #     if category_create_params[:category][:name] == ""
+    #   flash.now[:error] = "Please Enter a Catagory Name"
+    #   raise
+    # end
+    params.permit(category: [:name])
+  end
+end
+