24 files changed, 255 insertions, 45 deletions

@@ -10,5 +10,4 @@ comments_ready = ->
     $("#comment-reply-msg").hide()
     return false
 
-$(document).ready(comments_ready)
 $(document).on('turbolinks:load', comments_ready)
@@ -3,9 +3,9 @@
 // You can use Sass (SCSS) here: http://sass-lang.com/
 
 .blog-post {
-  font-size: 16px;
-  line-height: 24px;
+  line-height: 1.5em;
   margin: 0 1em 1em;
+  clear: both;
 
   .blog-title {
     flex-grow: 1;
@@ -41,6 +41,7 @@
     .post-calendar {
       width: 45px;
       height: 49px;
+      flex-shrink: 0;
 
       &.post-date-1 {
         background: image-url("date-bg-1.gif") no-repeat;
@@ -152,7 +153,6 @@
 
     .update-posted {
       display: block;
-      font-style: italic;
       background-color: #EAADEA;
       font-size: 16px;
       margin: .5em -20px;
@@ -160,6 +160,16 @@
       border-width: 1px 0 1px 0;
       border-style: solid;
       border-color: #DB70DB;
+
+      time {
+        font-style: italic;
+      }
+
+      .update-edit-link {
+        float: right;
+        color: blue;
+        font-weight: normal;
+      }
     }
   }
 }
@@ -194,6 +204,14 @@
     box-sizing: border-box;
   }
 
+  video {
+    max-width: 100%;
+  }
+
+  iframe {
+    max-width: 100%;
+  }
+
   figure {
     background-color: #eee;
     border: 1px solid #bbb;
@@ -201,6 +219,10 @@
     font-size: 0.75em;
     line-height: 24px;
 
+    @media only screen and (max-width: 767px) {
+      margin: 0;
+    }
+
     img {
       display: block;
       border: 1px solid #bbb;
@@ -450,3 +472,46 @@
 .next-post {
   float: right;
 }
+
+#streams-index {
+  width: 100%;
+  border-collapse: collapse;
+
+  #streams-index-header-row {
+    th {
+      background-color: #bdbdbd;
+      padding-left: 0.5em;
+      border-top: 1px solid #848484;
+      border-bottom: 1px solid #848484;
+    }
+  }
+
+  th {
+    padding-bottom: 0.5em;
+    padding-top: 0.5em;
+    text-align: left;
+  }
+
+  td {
+    padding-top: 1em;
+    padding-left: 0.5em;
+
+    time {
+      font-size: .75em;
+    }
+
+    .stream-link {
+      font-weight: bold;
+      text-decoration: none;
+
+      &, &:visited {
+        color: #ee2c2c;
+      }
+
+      &:hover {
+        text-decoration: underline;
+        color: #9ea1ad;
+      }
+    }
+  }
+}
@@ -1,42 +1,47 @@
 body#main-body {
   height: 100%;
   font-family: sans-serif;
+  font-size: 16px;
 }
 
 #container {
   height: 100%;
-  margin: 10px auto;
-  width: 75%; /* 66% */
   box-sizing: border-box;
-  min-width: 910px;
+
+  @media only screen and (min-width: 768px) {
+    margin: 10px auto;
+    width: 75%; /* 66% */
+    min-width: 910px;
+  }
 }
 
 #banner {
-  background-image: image-url("fourisland_header.png");
-  width: 900px;
-  height: 200px;
   margin: 0 auto;
 
   h1 {
-    margin: 0;
+    display: none;
+  }
 
-    a {
-      display: block;
-      width: 900px;
-      height: 200px;
-      text-indent: -5000px;
-      text-decoration: none;
-      margin: 0;
-    }
+  img {
+    width: 100%;
+    max-width: 900px;
+    display: block;
+    margin: 0 auto;
   }
 }
 
 #page-body {
   display: flex;
+
+  @media only screen and (max-width: 767px) {
+    flex-direction: column-reverse;
+  }
 }
 
 #main {
-  width: 70%;
+  @media only screen and (min-width: 768px) {
+    width: 70%;
+  }
 }
 
 #content {
@@ -48,7 +53,8 @@ body#main-body {
   width: 100%;
   text-align: center;
   padding: .25em;
-  font-weight: bold
+  font-weight: bold;
+  box-sizing: border-box;
 }
 
 .flash-notice {
@@ -61,15 +67,22 @@ body#main-body {
 
 #sidebar {
   box-sizing: border-box;
-  width: 30%;
   font-size: .75em;
   color: black;
   margin-top: 1em;
   margin-bottom: 2em;
   font-family: sans-serif;
+
+  @media only screen and (max-width: 767px) {
+    width: 100%;
+  }
+
+  @media only screen and (min-width: 768px) {
+    width: 30%;
+  }
 }
 
-#sidebar h2 {
+#sidebar h2, #mobile-header h2 {
   font-size: 1em;
 }
 
@@ -1,6 +1,7 @@
-require 'redcarpet/render_strip'
+
 
 class BlogsController < ApplicationController
+  include ApplicationHelper
 
   def summary
     @blogs = Blog.where(published: true).order(published_at: :desc).paginate(page: params[:page], per_page: 10)
@@ -27,12 +28,12 @@ class BlogsController < ApplicationController
     @prev = @blog.prev
     @next = @blog.next
 
-    body = Redcarpet::Markdown.new(Redcarpet::Render::StripDown).render(@blog.body)
+    body = stripped_markdown(@blog.body)
 
     set_meta_tags(og: {
       title: @blog.title,
       type: "article",
-      description: (body.length <= 300 ? body : body[0..299]),
+      description: body[0, 299],
       url: blog_url(@blog, host: "www.fourisland.com"),
       article: {
         published_time: @blog.published_at.iso8601,
@@ -5,6 +5,12 @@ class CommentsController < ApplicationController
     raise ActiveRecord::RecordNotFound unless @blog
     raise ActiveRecord::RecordNotFound unless @blog.published
 
+    unless verify_recaptcha
+      flash.alert = "Error posting comment."
+      render "blogs/show"
+      return
+    end
+
     @comment = @blog.comments.new(comment_params)
     @comment.request_ip = request.ip
     @comment.user_agent = request.user_agent
@@ -56,7 +62,8 @@ class CommentsController < ApplicationController
             CommentMailer.with(comment: @comment).reply_comment_email.deliver_later
           end
         else
-          CommentMailer.with(comment: @comment).new_pending_comment_email.deliver_later
+          # CommentMailer.with(comment: @comment).new_pending_comment_email.deliver_later
+          # I'm disabling pending comment emails, at least for now, because I am getting too many.
         end
       else
         flash.alert = "Error posting comment."
@@ -30,6 +30,20 @@ class QuotesController < ApplicationController
     end
   end
 
+  def search_form
+    @q = Quote.published.ransack
+  end
+
+  def search
+    @quotes = Quote.published.ransack(params[:q]).result(distinct: true).paginate(page: params[:page], per_page: 10)
+
+    respond_to do |format|
+      format.html { render :list }
+      format.json { render :json => @quotes }
+      format.xml { render :xml => @quotes }
+    end
+  end
+
   def random
     picked = Quote.where(state: :published).ids.sample
     redirect_to quote_url(picked)
@@ -1,7 +1,26 @@
 class StreamsController < ApplicationController
+  include ApplicationHelper
+
+  def index
+    @streams = Stream.order(latest_post_at: :desc).paginate(page: params[:page], per_page: 10)
+  end
 
   def show
     @stream = Stream.find_by_slug(params[:slug])
+    @updates = @stream.updates.paginate(page: params[:page], per_page: 10)
+
+    body = stripped_markdown(@stream.body)
+
+    set_meta_tags(og: {
+      title: @stream.title,
+      type: "article",
+      description: body[0, 299],
+      url: stream_url(@stream, host: "www.fourisland.com"),
+      article: {
+        published_time: @stream.created_at.iso8601,
+        modified_time: @stream.latest_post_at.iso8601
+      }
+    })
   end
 
 end
@@ -1,6 +1,7 @@
 require 'redcarpet'
 require 'rouge'
 require 'rouge/plugins/redcarpet'
+require 'redcarpet/render_strip'
 
 module ApplicationHelper
 
@@ -22,7 +23,7 @@ module ApplicationHelper
   def markdown(text, params = {})
     options = { fenced_code_blocks: true, highlight: true, footnotes: true }
 
-    html_options = {}
+    html_options = { with_toc_data: true }
     if params[:restricted]
       html_options[:filter_html] = true
     end
@@ -39,4 +40,20 @@ module ApplicationHelper
     ]
   end
 
+  def friends_sidebar
+    [
+      { title: "Entropically", url: "https://entropically.neocities.org/" },
+    ]
+  end
+
+  class StrippedSummary < Redcarpet::Render::StripDown
+    def block_html(raw_html)
+      nil
+    end
+  end
+
+  def stripped_markdown(text)
+    Redcarpet::Markdown.new(StrippedSummary).render(text)
+  end
+
 end
@@ -15,7 +15,7 @@ class Blog < ApplicationRecord
   validates :body, presence: true, if: :published
   validates :slug, presence: true, format: /\A[-a-z0-9]+\z/, if: :published
   validates :user, presence: true
-  validates :images, content_type: ['image/png', 'image/jpeg']
+  validates :images, content_type: ['image/png', 'image/jpeg', 'video/mp4', 'image/gif']
 
   before_validation :set_draft_title
   before_save :set_published_at
@@ -36,4 +36,13 @@ class Quote < ApplicationRecord
   def has_tags?
     !tags.empty?
   end
+
+  def self.ransackable_attributes(auth_object = nil)
+    ["content", "notes"]
+  end
+
+  def self.ransackable_associations(auth_object = nil)
+    []
+  end
+
 end
@@ -8,11 +8,22 @@ class Stream < ApplicationRecord
   validates :title, presence: true
   validates :slug, presence: true, format: /\A[-a-z0-9]+\z/
 
+  before_create :set_post_timestamp
+
   def path
     "/thinks/#{slug}"
   end
 
+  def to_param
+    slug
+  end
+
   def taggable
     self
   end
+
+  private
+    def set_post_timestamp
+      self.latest_post_at = self.created_at
+    end
 end
@@ -5,6 +5,8 @@ class Update < ApplicationRecord
 
   validates :stream, :body, presence: true
 
+  after_create :set_latest_timestamp
+
   def path
     "/thinks/#{stream.slug}\#update-#{id}"
   end
@@ -12,4 +14,10 @@ class Update < ApplicationRecord
   def taggable
     stream
   end
+
+  private
+    def set_latest_timestamp
+      self.stream.latest_post_at = self.created_at
+      self.stream.save!
+    end
 end
@@ -42,9 +42,13 @@
   .details-module.image-uploads
     %h4 Images
     - f.object.images.each do |image|
-      = image_tag image.variant(:thumb)
-      = f.hidden_field :images, multiple: true, value: image.signed_id
-      %pre= rails_blob_url(image)
+      - if image.representable?
+        = image_tag image.variant(:thumb)
+      - else
+        = image.filename.to_s
+      - unless image.new_record?
+        = f.hidden_field :images, multiple: true, value: image.signed_id
+        %pre= rails_blob_url(image)
       %hr
     = f.file_field :images, multiple: true
   .details-module= f.submit
@@ -1,3 +1,3 @@
 - title "Editing #{@stream.title}"
-= form_for @stream, url: admin_stream_url(@stream), html: { id: "entry-form" } do |f|
+= form_for @stream, url: admin_stream_url(@stream.id), html: { id: "entry-form" } do |f|
   = render partial: "form", locals: { f: f }
@@ -10,5 +10,5 @@
       %td= stream.created_at.strftime("%B %d, %Y, %l:%M%P")
       %td
         %ul.admin-actions
-          %li= link_to "Edit", edit_admin_stream_url(stream)
-          %li= link_to "Add Update", new_admin_stream_update_url(stream)
+          %li= link_to "Edit", edit_admin_stream_url(stream.id)
+          %li= link_to "Add Update", new_admin_stream_update_url(stream.id)
@@ -1,3 +1,3 @@
 - title "Editing stream update"
-= form_for @update, url: admin_stream_update_url(@stream, @update), html: { id: "entry-form" } do |f|
+= form_for @update, url: admin_stream_update_url(@stream.id, @update), html: { id: "entry-form" } do |f|
   = render partial: "form", locals: { f: f }
@@ -24,6 +24,9 @@
     .comment-website-field.comment-field
       .comment-field-label= f.label :website, "Website (Optional)"
       .comment-field-input= f.text_field :website, type: :url
+    .comment-website-field.comment-field
+      .comment-field-label
+      .comment-field-input= recaptcha_tags
     .comment-submit-button.comment-field
       .comment-field-label
       .comment-field-input= f.submit "Post"
@@ -9,15 +9,16 @@
     %link{rel: "me", href: "mailto:fefferburbia+thoughts@gmail.com"}
     %link{rel: "webmention", href: webmentions_url}
     %link{rel: "alternate", type: "application/atom+xml", href: blogs_url(format: :atom)}
+    %meta{name: "viewport", content: "width=device-width, initial-scale=1.0"}
   %body#main-body
     - if flash[:alert]
       %div#flash.flash-alert= flash[:alert]
     - if flash[:notice]
       %div#flash.flash-notice= flash[:notice]
     #container
-      #page-header
-        %header#banner
-          %h1= link_to "Four Island", root_url
+      %header#banner
+        %h1 Four Island
+        = link_to image_tag("fourisland_header.png"), root_url
       #page-body
         #sidebar
           .sidebar-module
@@ -53,6 +54,14 @@
                     = link_to link[:title], link[:url], link.include?(:extra) ? link[:extra] : {}
           .sidebar-module.fun-links
             .bubble.rounded
+              %h2 Friends
+              %ul
+                - friends_sidebar().each do |link|
+                  %li
+                    = image_tag "tag_#{cycle("blue", "green", "orange", "pink", "purple", "red", "yellow")}.png"
+                    = link_to link[:title], link[:url], link.include?(:extra) ? link[:extra] : {}
+          .sidebar-module.fun-links
+            .bubble.rounded
               %h2 Blog links
               %ul
                 %li
@@ -25,6 +25,7 @@
           - if user_signed_in?
             %li= link_to_unless_current "Submit", new_quote_url
           %li= link_to_unless_current "Tags", tags_quotes_url
+          %li= link_to_unless_current "Search", search_form_quotes_url
           %li= link_to_unless_current "Stats", stats_quotes_url
           %li= link_to_unless_current "Feed", latest_quotes_url(:atom)
           - if user_signed_in?
@@ -0,0 +1,6 @@
+%h3 Search
+= search_form_for @q, url: search_quotes_url do |f|
+  .form-field
+    = f.label :content_or_notes_cont, "Query:"
+    = f.search_field :content_or_notes_cont
+  .form-field= f.submit
@@ -1,6 +1,8 @@
 %article#stream-post
   %h2#stream-title= stream.title
   - unless stream.body.blank?
-    %header#stream-intro.entry-content= stream.body.html_safe
-  - unless stream.updates.empty?
-    = render stream.updates
+    %header#stream-intro.entry-content= markdown(stream.body)
+  = will_paginate @updates
+  - unless @updates.empty?
+    = render @updates
+  = will_paginate @updates
@@ -0,0 +1,19 @@
+%table#streams-index
+  %tr#streams-index-header-row
+    %th Stream Topic
+    %th Updates
+    %th Last Post
+  - @streams.each do |stream|
+    %tr
+      %td
+        = link_to stream.title, stream, class: "stream-link"
+        %br
+        %time= stream.created_at.strftime("%B #{stream.created_at.day.ordinalize}, %Y at %-I:%M:%S%P")
+      %td= stream.updates.size
+      %td
+        - unless stream.updates.empty?
+          - latest_post = stream.updates.order(created_at: :desc).first
+          = link_to (stripped_markdown(latest_post.body)[0, 30] + "..."), stream
+          %br
+          %time= latest_post.created_at.strftime("%B #{latest_post.created_at.day.ordinalize}, %Y at %-I:%M:%S%P")
+= will_paginate @streams
@@ -1,3 +1,3 @@
 - title @stream.title
-.breadcrumb= link_to "← Back to home page", root_path
+.breadcrumb= link_to "← Back to streams", streams_path
 = render @stream
@@ -1,3 +1,6 @@
 %section.stream-update.entry-content{ id: "update-#{update.id}" }
-  %time.update-posted= update.created_at.strftime("%B #{update.created_at.day.ordinalize}, %Y at %-I:%M:%S%P")
-  = update.body.html_safe
+  %header.update-posted
+    %time= update.created_at.strftime("%B #{update.created_at.day.ordinalize}, %Y at %-I:%M:%S%P")
+    - if user_signed_in? and !update.new_record?
+      = link_to "Edit", edit_admin_stream_update_path(update.stream.id, update), :class => "update-edit-link"
+  = markdown(update.body)