Reverting

Gemfile

@@ -24,8 +24,7 @@ gem 'jbuilder', '~> 2.0'
 # bundle exec rake doc:rails generates the API under doc/api.
 gem 'sdoc', '~> 0.4.0', group: :doc
 
-# Use ActiveModel has_secure_password
- gem 'bcrypt', '~> 3.1.7'
+gem 'bcrypt', '~> 3.1.7'
 
 gem 'kaminari'
 
@@ -38,6 +37,16 @@ gem 'hirb'
 gem 'faker'
 
 gem 'cancancan'
+
+gem 'simple_form'
+
+gem 'carrierwave'
+gem 'mini_magick'
+
+gem 'delayed_job_active_record'
+gem 'delayed_job_web'
+
+gem 'animate-rails'
 # Use Unicorn as the app server
 # gem 'unicorn'
 
@@ -46,8 +55,10 @@ gem 'cancancan'
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
+  gem 'pry'
+  gem 'pry-rails'
   gem 'byebug'
-
+  gem "letter_opener"
   # Access an IRB console on exception pages or by using <%= console %> in views
   gem 'web-console', '~> 2.0'
 

Gemfile.lock

@@ -36,6 +36,9 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
+    addressable (2.3.8)
+    animate-rails (1.0.8)
+      rails
     arel (6.0.0)
     autoprefixer-rails (5.2.1)
       execjs
@@ -51,6 +54,12 @@ GEM
     byebug (5.0.0)
       columnize (= 0.9.0)
     cancancan (1.10.1)
+    carrierwave (0.10.0)
+      activemodel (>= 3.2.0)
+      activesupport (>= 3.2.0)
+      json (>= 1.7)
+      mime-types (>= 1.16)
+    coderay (1.1.0)
     coffee-rails (4.1.0)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
@@ -60,6 +69,15 @@ GEM
     coffee-script-source (1.9.1.1)
     columnize (0.9.0)
     debug_inspector (0.0.2)
+    delayed_job (4.0.6)
+      activesupport (>= 3.0, < 5.0)
+    delayed_job_active_record (4.0.3)
+      activerecord (>= 3.0, < 5.0)
+      delayed_job (>= 3.0, < 4.1)
+    delayed_job_web (1.2.10)
+      activerecord (> 3.0.0)
+      delayed_job (> 2.0.3)
+      sinatra (>= 1.4.4)
     erubis (2.7.0)
     execjs (2.5.2)
     faker (1.4.3)
@@ -82,18 +100,32 @@ GEM
     kaminari (0.16.3)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
+    launchy (2.4.3)
+      addressable (~> 2.3)
+    letter_opener (1.4.1)
+      launchy (~> 2.2)
     loofah (2.0.2)
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
+    method_source (0.8.2)
     mime-types (2.6.1)
+    mini_magick (4.2.7)
     mini_portile (0.6.2)
     minitest (5.7.0)
     multi_json (1.11.0)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     pg (0.18.2)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-rails (0.3.4)
+      pry (>= 0.9.10)
     rack (1.6.1)
+    rack-protection (1.5.3)
+      rack
     rack-test (0.6.3)
       rack (>= 1.0)
     rails (4.2.1)
@@ -132,6 +164,14 @@ GEM
     sdoc (0.4.1)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
+    simple_form (3.1.0)
+      actionpack (~> 4.0)
+      activemodel (~> 4.0)
+    sinatra (1.4.6)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (>= 1.3, < 3)
+    slop (3.6.0)
     spoon (0.0.4)
       ffi
     spring (1.3.6)
@@ -161,22 +201,31 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  animate-rails
   awesome_print
   bcrypt (~> 3.1.7)
   bootstrap-sass (~> 3.3.5)
   byebug
   cancancan
+  carrierwave
   coffee-rails (~> 4.1.0)
+  delayed_job_active_record
+  delayed_job_web
   faker
   hirb
   interactive_editor
   jbuilder (~> 2.0)
   jquery-rails
   kaminari
+  letter_opener
+  mini_magick
   pg
+  pry
+  pry-rails
   rails (= 4.2.1)
   sass-rails (~> 5.0)
   sdoc (~> 0.4.0)
+  simple_form
   spring
   turbolinks
   uglifier (>= 1.3.0)

README.md

@@ -0,0 +1,32 @@
+#Blog Features:
+
+##Homepage
+
+#### Site Navigation Bar:
+	- Visible on each page
+	- Drop-down for Post Categories
+	- User Log In / Sign Up / Log Out
+	- Click on site header leads to homepage
+
+#### Image carousel
+	- Useful for highlight news/updates/features
+
+#### Recent blog posts featured
+	- Link in title and full body shown
+
+##Creating Post
+	- Posts can have categories and tags in addition to the body and title
+	- Can add user collaborators for the post for management ability
+
+##Viewing Post
+	- Includes Liking, Favouriting, UpVoting
+	- Users can click 'Join' / 'Leave'
+	- File Attachment previews
+	- Comment box for other viewers
+	- Comments print avatar, body, and deletion link if applicable
+
+##Feautures Being Added in the Future:
+	- Working AJAX on the posts show page
+	- Nested drop down for All Posts > Post Index / Post Category in the future
+	- Implement clicking on image to link to parts of site
+	- Add image preview to Recent Posts featured

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

@@ -6,13 +6,17 @@
   h5 {
     color: #0079a3;
     font-size: 35pt;
+    letter-spacing: 15px;
     margin-top: 25px;
     margin-bottom:5px;
     padding-top: 0px;
     padding-bottom: 10px;
     font-weight: lighter;
   }
 }
+.header-text a:hover{
+  text-decoration: none;
+}
 
 .header-link {
   text-align: center;
@@ -24,24 +28,37 @@
 .user{
   text-align: right;
   background: rgba(0, 121, 163, 0.6);
+  background-image: url("blue.jpg");
   width:100%;
   margin-left: 0;
   margin-right: 0;
-  height: 28px;
+  height: 55px;
   padding-right: 5px;
   padding-top: 5px;
   padding-bottom: 5px;
   color: #FFFFFF;
 }
 .avatar {
   border-radius: 50%;
+  width: 45px;
+  height: 45px;
+}
+h1, h2, h3, h4 {
+  font-weight: lighter;
 }
-
 .body {
-   padding-left: 10px;
-   padding-right: 10px;
+  padding-left: 10px;
+  padding-right: 10px;
+  .post-options {
+    display: inline-block;
+  }
   .button-options {
     height: auto;
+    padding: 25px;
+    .button-select {
+      display: inline-block;
+      float: left;
+    }
   .button-options button {
   }
     .button-long {
@@ -90,7 +107,7 @@
       background-color: #ff4c4c;
     }
     .fave {
-      background-color: #65e0fc;
+      background-color: #ffff7f;
     }
   }
 }
@@ -107,3 +124,85 @@
   padding-bottom: 15px;
   border-bottom: 1px dotted #0079a3;
 }
+.post-image {
+  display: block;
+  padding-top: 20px;
+  padding-bottom: 20px;
+}
+/*Simple Form Styling*/
+.form-group label {
+  display: block;
+  font-size: 16pt;
+  font-family: Arial;
+  font-weight: lighter;
+  color: #074c62;
+  text-align: left;
+  margin-right: 10px;
+}
+
+.form-group input {
+  padding: 5px;
+  margin-bottom: 10px;
+  background-color: #ececec;
+  border: 1px solid #0079a3;
+  border-radius: 10px;
+  width: 650px;
+  height: 40px;
+}
+
+.form-group textarea {
+  padding: 5px;
+  margin-bottom: 10px;
+  background-color: #ececec;
+  border: 1px solid #0079a3;
+  border-radius: 10px;
+  width: 650px;
+  height: 120px;
+}
+
+#post_category_id {
+  width: 325px;
+  height: 40px;
+  border-radius: 10px;
+  background-color: #0079a3;
+  color: #FFFFFF;
+  font-weight: lighter;
+  text-transform: uppercase;
+}
+.form-control {
+  font-size: 14pt;
+  font-weight: lighter;
+  color: #999999;
+  background-color: #0079a3;
+  border-radius: 10px;
+}
+.check-boxes label {
+  background-color: #0079a3;
+  height: 40px;
+  padding: 5px;
+  border-radius: 10px;
+  margin-right: 8px;
+  color: #FFFFFF;
+  font-weight: lighter;
+  text-transform: uppercase;
+  .collection_check_boxes {
+    margin-left: 10px;
+    margin-right: 15px;
+    height: 30px;
+  }
+}
+.submit-button {
+  width: auto;
+  height: 40px;
+  margin-top: 15px;
+  margin-left: 5px;
+  padding-top: 0px;
+  padding-left: 5px;
+  padding-bottom: 5px;
+  border-radius: 5px;
+  color: #333333;
+  font-size: 18pt;
+  font-weight: lighter;
+  text-align: center;
+  background-color: #ff7256;
+}

app/assets/stylesheets/favourites.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the favourites 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

@@ -1,6 +1,5 @@
 class ApplicationController < ActionController::Base
-  # Prevent CSRF attacks by raising an exception.
-  # For APIs, you may want to use :null_session instead.
+
   protect_from_forgery with: :exception
   before_action :find_category
 
@@ -21,5 +20,5 @@ def current_user
   def find_category
     @categories = Category.all
   end
-  
+
 end