13 files changed, 99 insertions, 11 deletions

@@ -1,9 +1,25 @@
 # 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/
+
+create_record_toggle = (checked) ->
+  if checked
+    $(".record-description-field").show()
+  else
+    $(".record-description-field").hide()
+
+published_field_toggle = (checked) ->
+  if checked
+    $(".should-create-record-field input[type=checkbox]").prop("disabled", false)
+  else
+    $(".should-create-record-field input[type=checkbox]").prop("disabled", true)
+    $(".should-create-record-field input[type=checkbox]").prop("checked", false)
+    create_record_toggle(false)
+
 $(document).on "turbolinks:load", ->
+  if $(".published-field").length > 0
+    published_field_toggle($(".published-field input[type=checkbox]").prop("checked"))
   $(".should-create-record-field input[type=checkbox]").change ->
-    if $(".should-create-record-field input[type=checkbox]").prop("checked")
-      $(".record-description-field").show()
-    else
-      $(".record-description-field").hide()
+    create_record_toggle($(this).prop("checked"))
+  $(".published-field input[type=checkbox]").change ->
+    published_field_toggle($(this).prop("checked"))
@@ -190,6 +190,12 @@ body {
   }
 }
 
+.published-field {
+  label {
+    font-size: .75em;
+  }
+}
+
 .record-description-field {
   display: none;
   margin-top: 1em;
@@ -2,7 +2,11 @@ class Admin::BlogsController < Admin::AdminController
   before_action :set_section
 
   def index
-    @blogs = Blog.order(created_at: :desc)
+    @blogs = Blog.where(published: true).order(published_at: :desc)
+  end
+
+  def drafts
+    @blogs = Blog.where(published: false).order(updated_at: :desc)
   end
 
   def new
@@ -42,7 +46,7 @@ class Admin::BlogsController < Admin::AdminController
   private
 
     def blog_params
-      params.require(:blog).permit(:title, :body, :slug, records_attributes: [:description, :_destroy])
+      params.require(:blog).permit(:title, :body, :slug, :published, records_attributes: [:description, :_destroy])
     end
 
     def set_section
@@ -2,6 +2,9 @@ class BlogsController < ApplicationController
 
   def show
     @blog = Blog.find_by_slug(params[:slug])
+
+    raise ActiveRecord::RecordNotFound unless @blog
+    raise ActiveRecord::RecordNotFound unless @blog.published or user_signed_in?
   end
 
 end
@@ -6,7 +6,28 @@ class Blog < ApplicationRecord
 
   accepts_nested_attributes_for :records, allow_destroy: true
 
+  before_save :set_published_at
+
   def path
     "/says/#{slug}"
   end
+
+  def posted_at
+    if published
+      published_at
+    else
+      updated_at
+    end
+  end
+
+  private
+    def set_published_at
+      if self.published
+        if self.published_at.blank?
+          self.published_at = DateTime.now
+        end
+      else
+        self.published_at = nil
+      end
+    end
 end
@@ -16,6 +16,10 @@
         - f.object.errors.full_messages.each do |error|
           %li= error
   .details-module
+    .published-field
+      = f.check_box :published
+      = f.label :published
+  .details-module
     = f.fields_for :records, Record.new do |builder|
       .should-create-record-field
         = builder.check_box :_destroy, {checked: false}, "0", "1"
@@ -0,0 +1,10 @@
+%table#entries
+  %tr
+    %th Title
+    %th Last updated
+    %th
+  - @blogs.each do |blog|
+    %tr{ class: cycle("even", "odd") }
+      %td= blog.title
+      %td= blog.updated_at.strftime("%B %d, %Y, %l:%M%P")
+      %td= link_to "Edit", edit_admin_blog_url(blog)
@@ -1,10 +1,10 @@
 %table#entries
   %tr
     %th Title
-    %th Date created
+    %th Date published
     %th
   - @blogs.each do |blog|
     %tr{ class: cycle("even", "odd") }
       %td= blog.title
-      %td= blog.created_at.strftime("%B %d, %Y, %l:%M%P")
+      %td= blog.published_at.strftime("%B %d, %Y, %l:%M%P")
       %td= link_to "Edit", edit_admin_blog_url(blog)
@@ -3,4 +3,4 @@
 %footer#blog-footer
   This entry was posted on
   = succeed "." do
-    %time= @blog.created_at.strftime("%B #{@blog.created_at.day.ordinalize}, %Y at %-I:%M:%S%P")
+    %time= @blog.posted_at.strftime("%B #{@blog.posted_at.day.ordinalize}, %Y at %-I:%M:%S%P")
@@ -24,6 +24,7 @@
           = link_to "Blogs", admin_blogs_url, class: "major-link"
           %ul.minors
             %li.minor= link_to "New blog", new_admin_blog_url
+            %li.minor= link_to "Drafts", drafts_admin_blogs_url
         %li{major_sidebar_attrs("streams")}
           = link_to "Streams", admin_streams_url, class: "major-link"
           %ul.minors
@@ -2,7 +2,11 @@ Rails.application.routes.draw do
   namespace :admin do
     get '/', to: 'dashboard#index'
 
-    resources :blogs, except: [:show]
+    resources :blogs, except: [:show] do
+      collection do
+        get 'drafts'
+      end
+    end
 
     resources :streams, except: [:show] do
       resources :updates, except: [:index, :show]
@@ -0,0 +1,17 @@
+class AddBlogDrafts < ActiveRecord::Migration[5.1]
+  def change
+    add_column :blogs, :published, :boolean, null: false, default: false
+    add_column :blogs, :published_at, :datetime, null: true
+
+    reversible do |dir|
+      dir.up do
+        Blog.all.each do |blog|
+          blog.published = true
+          blog.published_at = blog.created_at
+
+          blog.save!
+        end
+      end
+    end
+  end
+end
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20180702221133) do
+ActiveRecord::Schema.define(version: 20180704125527) do
 
   create_table "blogs", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin" do |t|
     t.string "title"
@@ -18,6 +18,8 @@ ActiveRecord::Schema.define(version: 20180702221133) do
     t.string "slug", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.boolean "published", default: false, null: false
+    t.datetime "published_at"
   end
 
   create_table "ckeditor_assets", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin" do |t|