12 files changed, 60 insertions, 18 deletions

@@ -227,6 +227,16 @@ body {
   }
 }
 
+#entry-preview-link {
+  a {
+    text-decoration: none;
+
+    &:hover {
+      text-decoration: underline;
+    }
+  }
+}
+
 #flash {
   display: inline-block;
   color: black;
@@ -9,6 +9,16 @@ class Admin::BlogsController < Admin::AdminController
     @blogs = Blog.where(published: false).order(updated_at: :desc)
   end
 
+  def show
+    @blog = Blog.find(params[:id])
+
+    if @blog.published
+      redirect_to blog_url(@blog.slug)
+    else
+      render layout: "application"
+    end
+  end
+
   def new
     @blog = Blog.new
   end
@@ -4,7 +4,7 @@ class BlogsController < ApplicationController
     @blog = Blog.find_by_slug(params[:slug])
 
     raise ActiveRecord::RecordNotFound unless @blog
-    raise ActiveRecord::RecordNotFound unless @blog.published or user_signed_in?
+    raise ActiveRecord::RecordNotFound unless @blog.published
   end
 
 end
@@ -1,26 +1,26 @@
 class Blog < ApplicationRecord
   has_many :records, as: :recordable, inverse_of: :recordable
 
-  validates :title, :body, presence: true
-  validates :slug, presence: true, format: /\A[-a-z0-9]+\z/
+  validates :title, presence: true
+  validates :body, presence: true, if: :published
+  validates :slug, presence: true, format: /\A[-a-z0-9]+\z/, if: :published
 
   accepts_nested_attributes_for :records, allow_destroy: true
 
+  before_validation :set_draft_title
   before_save :set_published_at
 
   def path
     "/says/#{slug}"
   end
 
-  def posted_at
-    if published
-      published_at
-    else
-      updated_at
+  private
+    def set_draft_title
+      if self.title.blank? and not self.published
+        self.title = "Untitled draft"
+      end
     end
-  end
 
-  private
     def set_published_at
       if self.published
         if self.published_at.blank?
@@ -15,6 +15,12 @@
       %ul
         - f.object.errors.full_messages.each do |error|
           %li= error
+  - unless f.object.new_record?
+    #entry-preview-link.details-module
+      - if f.object.published
+        = link_to "View post", blog_url(f.object.slug_was), target: "entry-preview"
+      - else
+        = link_to "Preview post", admin_blog_url(f.object), target: "entry-preview"
   .details-module
     .published-field
       = f.check_box :published
@@ -7,4 +7,7 @@
     %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)
+      %td
+        %ul.admin-actions
+          %li= link_to "Preview", admin_blog_url(blog)
+          %li= link_to "Edit", edit_admin_blog_url(blog)
@@ -7,4 +7,7 @@
     %tr{ class: cycle("even", "odd") }
       %td= blog.title
       %td= blog.published_at.strftime("%B %d, %Y, %l:%M%P")
-      %td= link_to "Edit", edit_admin_blog_url(blog)
+      %td
+        %ul.admin-actions
+          %li= link_to "View", blog_url(blog.slug)
+          %li= link_to "Edit", edit_admin_blog_url(blog)
@@ -0,0 +1,5 @@
+= render partial: "blogs/blog", object: @blog
+%footer#blog-footer
+  This draft was last updated on
+  = succeed "." do
+    %time= @blog.updated_at.strftime("%B #{@blog.updated_at.day.ordinalize}, %Y at %-I:%M:%S%P")
@@ -3,4 +3,4 @@
 %footer#blog-footer
   This entry was posted on
   = succeed "." do
-    %time= @blog.posted_at.strftime("%B #{@blog.posted_at.day.ordinalize}, %Y at %-I:%M:%S%P")
+    %time= @blog.published_at.strftime("%B #{@blog.published_at.day.ordinalize}, %Y at %-I:%M:%S%P")
@@ -2,7 +2,7 @@ Rails.application.routes.draw do
   namespace :admin do
     get '/', to: 'dashboard#index'
 
-    resources :blogs, except: [:show] do
+    resources :blogs do
       collection do
         get 'drafts'
       end
@@ -22,9 +22,9 @@ Rails.application.routes.draw do
 
   root "records#index"
 
-  get 'says/:slug', to: 'blogs#show'
+  get 'says/:slug', to: 'blogs#show', as: :blog
 
-  get 'thinks/:slug', to: 'streams#show'
+  get 'thinks/:slug', to: 'streams#show', as: :stream
 
   mount Pokeviewer::Engine => '/poke3'
 end
@@ -0,0 +1,5 @@
+class UnrequireBlogSlug < ActiveRecord::Migration[5.1]
+  def change
+    change_column_null :blogs, :slug, true
+  end
+end
@@ -10,12 +10,12 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20180704125527) do
+ActiveRecord::Schema.define(version: 20180704144707) do
 
   create_table "blogs", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin" do |t|
     t.string "title"
     t.text "body"
-    t.string "slug", null: false
+    t.string "slug"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.boolean "published", default: false, null: false