ecrire 0.28.3 → 0.29.0

data/lib/ecrire/app/views/admin/posts/index.html.erb

@@ -1,35 +1,54 @@
-<%= content_tag :header, as: 'Posts.Filter', href: admin_posts_path do %>
-  <section class='status'>
-  </section>
-
-  <section class='search'>
-    <%= content_tag :div, href: admin_tags_path, as: 'Posts.Filter.Tags' do %>
-      <template for='Posts.Filter.Tags'>
-        <svg class='placeholder' x="0px" y="0px" viewBox='0 0 20 20'>
-          viewBox="0 0 20 20" enable-background="new 0 0 20 20" xml:space="preserve">
-          <path d="M18.662,5.521L5.237,19l0.707-4.967l-4.945,0.709L14.424,1.263c0.391-0.392,1.133-0.308,1.412,0l2.826,2.839
-          C19.162,4.575,19.053,5.128,18.662,5.521z"/>
-        </svg>
-
-        <svg class='clear' x="0px" y="0px" viewBox="0 0 20 20" enable-background="new 0 0 20 20" xml:space="preserve">
-          <path d="M10,1.6c-4.639,0-8.4,3.761-8.4,8.4c0,4.639,3.761,8.4,8.4,8.4s8.4-3.761,8.4-8.4C18.4,5.361,14.639,1.6,10,1.6z
-          M14.789,13.061l-1.729,1.729L10,11.729l-3.061,3.06l-1.729-1.729L8.272,10L5.211,6.939L6.94,5.211L10,8.271l3.061-3.061
-          l1.729,1.729L11.728,10L14.789,13.061z"/>
-        </svg>
-
-        <span class='tag'></span>
-      </template>
-    <% end %>
-
-    <input type='text' placeholder='Search for a post' class='search' />
-
-  </section>
-
-  <section class='new'>
-    <%= link_to 'New post', new_admin_post_path %>
-  </section>
-<% end %>
-
 <section class='posts'>
-  <%= render 'admin/posts/posts', published: @posts.published, drafted: @posts.drafted %>
+  <aside>
+
+    <%= link_to 'New post', new_admin_post_path, class: %w(new post) %>
+
+  </aside>
+
+  <div class='posts list filters'>
+    <div class='search'>
+      <%= content_tag :div, href: admin_tags_path, as: 'Posts.Filter.Tags' do %>
+        <input type='hidden' name='posts[tag]' form='PostsFilter' />
+        <template for='Posts.Filter.Tags'>
+          <svg class='placeholder' x="0px" y="0px" viewBox='0 0 20 20'>
+            viewBox="0 0 20 20" enable-background="new 0 0 20 20" xml:space="preserve">
+            <path d="M18.662,5.521L5.237,19l0.707-4.967l-4.945,0.709L14.424,1.263c0.391-0.392,1.133-0.308,1.412,0l2.826,2.839
+            C19.162,4.575,19.053,5.128,18.662,5.521z"/>
+          </svg>
+
+          <svg class='clear' x="0px" y="0px" viewBox="0 0 20 20" enable-background="new 0 0 20 20" xml:space="preserve">
+            <path d="M10,1.6c-4.639,0-8.4,3.761-8.4,8.4c0,4.639,3.761,8.4,8.4,8.4s8.4-3.761,8.4-8.4C18.4,5.361,14.639,1.6,10,1.6z
+            M14.789,13.061l-1.729,1.729L10,11.729l-3.061,3.06l-1.729-1.729L8.272,10L5.211,6.939L6.94,5.211L10,8.271l3.061-3.061
+            l1.729,1.729L11.728,10L14.789,13.061z"/>
+          </svg>
+
+          <span class='tag'></span>
+        </template>
+      <% end %>
+
+      <input type='text' name='posts[title]' placeholder='Search for a post' class='search' form='PostsFilter' />
+
+    </div>
+    <ul class='filters'>
+      <li>
+        <%= radio_button_tag 'posts[status]', 'drafted', 'drafted' == search_posts_params[:status], form: 'PostsFilter' %>
+        <%= label_tag 'posts_status_drafted', 'Draft' %>
+      </li>
+      <li>
+        <%= radio_button_tag 'posts[status]', 'published', 'published' == search_posts_params[:status], form: 'PostsFilter' %>
+        <%= label_tag 'posts_status_published', 'Published' %>
+      </li>
+      <li>
+        <%= radio_button_tag 'posts[status]', 'all', 'all' == search_posts_params[:status], form: 'PostsFilter' %>
+        <%= label_tag 'posts_status_all', 'All Posts' %>
+      </li>
+    </ul>
+
+    <ul class='posts' as='Posts.List'>
+      <%= render @posts %>
+    </ul>
+  </div>
 </section>
+
+<%= form_for :posts, url: admin_posts_path, method: 'GET', html: {name: 'posts', id: 'PostsFilter', as: 'Posts.Filter'} do |f| %>
+<% end %>

data/lib/ecrire/app/views/admin/posts/index.js.erb

@@ -1 +1 @@
-e.HTML = "<%= j render('posts', published: @posts.published, drafted: @posts.drafted) %>".toHTML()
+e.HTML = "<%= j content_tag(:ul, render(@posts)) %>".toHTML()

data/lib/ecrire/app/views/admin/posts/show.html.erb

@@ -1,27 +1,9 @@
-<% content_for :class, 'post view' %>
-
-<%= content_tag :header do |header| %>
-  <nav>
-    <div class='meta'>
-      <%= link_to 'Edit', edit_admin_post_path(@post), class: %w(button) %>
-      <%= link_to 'Preview', admin_post_path(@post), class: %w(selected button) %>
-      <%= link_to 'Tags', admin_post_tags_path(@post), class: %w(button) %>
-      <%= link_to 'Title', admin_post_titles_path(@post), class: %w(button) %>
-    </div>
-
-    <%= content_tag :div, class: %w(publish state), href: admin_post_toggle_path(@post), method: :put, published: @post.published?, as: 'Post.Publish' do %>
-      <label>Published</label>
-      <label>Draft</label>
-    <% end %>
-  </nav>
-
-  <%= content_tag :h2, @post.title %>
-
-  <% if @post.header? %>
-    <% header[:style] = "background-image: url(#{@post.header.url});" %>
-  <% end %>
+<%= content_for :post_buttons do %>
+  <%= link_to 'Edit', edit_admin_post_path(@post), class: %w(button) %>
 <% end %>
 
-<section class='preview'>
+<%= render 'admin/posts/header/base', post: @post %>
+
+<section class='preview' id='PostPreviewContent'>
   <%= content_tag :article, @post.compiled_content.try(:html_safe) %>
 <section>

data/lib/ecrire/app/views/admin/posts/tags/_tag.html.erb

@@ -1,4 +1,13 @@
-<%= content_tag :li, as: 'Post.Tag', oid: tag.id, href: admin_post_tag_toggle_path(@post, tag), method: :put do %>
-	<%= content_tag :input, nil, id: "label_#{tag.id}", type: 'checkbox', checked: @post.tags.include?(tag) %>
+<%= content_tag :li do |li| %>
+
+  <% li[:class] << 'tag' %>
+  <% li[:tabindex] = tag.id %>
+  <% li[:as] = 'Post.Tags.Tag' %>
+  <% li[:method] = :put %>
+  <% li[:oid] = tag.id %>
+  <% li[:href] = admin_post_tag_toggle_path(post, tag) %>
+
+  <%= content_tag :input, nil, id: "label_#{tag.id}", type: 'checkbox', checked: post.tags.include?(tag) %>
+
   <%= content_tag :label, tag.name, for: "label_#{tag.id}" %>
 <% end %>

data/lib/ecrire/app/views/admin/posts/tags/_tags.html.erb

@@ -0,0 +1,12 @@
+<%= form_tag admin_post_tags_path(post), as: 'Post.Tags.Form' do |f| %>
+  <%= text_field_tag 'tag[name]', nil, id: 'TagName', placeholder: 'Create a new tag', autocomplete: :off %>
+  <p class='message'>A new tag will be created if no match can be found. The tag it finds will be toggled.</p>
+<% end %>
+
+<ul class='tags' as='Post.Tags.List'>
+  <% if tags.any? %>
+    <%= render partial: 'admin/posts/tags/tag', collection: tags, locals: { post: post } %>
+  <% else %>
+    <li class='empty'>No tag was found.</li>
+  <% end %>
+</ul>

data/lib/ecrire/app/views/admin/posts/tags/create.js.erb

@@ -0,0 +1,2 @@
+e.HTML = "<%= j render('admin/posts/tags/tag', tag: @tag, post: @post) %>".toHTML()
+e.TagsHTML = "<%= j post_tags(@post) %>".toHTML()

data/lib/ecrire/app/views/admin/posts/tags/index.js.erb

@@ -0,0 +1 @@
+e.HTML = "<%= j popup_tag(render('admin/posts/tags/tags', post: @post, tags: @tags), class: %w(tags)) %>".toHTML()

data/lib/ecrire/app/views/admin/posts/tags/toggle.js.erb

@@ -1 +1,2 @@
-e.TagIncluded = <%= @post.tags.include? @tag %>
+e.HTML = "<%= j render('admin/posts/tags/tag', tag: @tag, post: @post) %>".toHTML()
+e.TagsHTML = "<%= j post_tags(@post) %>".toHTML()

data/lib/ecrire/app/views/admin/posts/titles/_form.html.erb

@@ -1,10 +1,10 @@
-<%= form_for title, url: url, as: 'title' do |form| %>
+<%= form_for title, url: url, as: 'title', remote: request.xhr? do |form| %>
   <%= content_tag :div, class: %w(fieldset) do |div| %>
     <% if title.errors.any? %>
       <% div.css << 'errors' %>
     <% end %>
 
-    <%= form.text_field :name, placeholder: 'Create a new title for this post', tabindex: 1 %>
+    <%= form.text_field :name, placeholder: 'Create a new title for this post', tabindex: 1, autocomplete: :off %>
 
     <% if title.errors.any? %>
       <ul class='errors'>

data/lib/ecrire/app/views/admin/posts/titles/_index.html.erb

@@ -0,0 +1,10 @@
+<% if post.published? %>
+  <%= render 'admin/posts/titles/form', title: title, url: admin_post_titles_path(post) %>
+<% else %>
+  <%= render 'admin/posts/titles/form', title: title, url: admin_post_title_path(post, title) %>
+<% end %>
+
+<h3>Titles for this post</h3>
+
+<%= render 'admin/posts/titles/titles', post: post %>
+

data/lib/ecrire/app/views/admin/posts/titles/_titles.html.erb

@@ -0,0 +1,6 @@
+<ul class='titles' as='Post.Titles'>
+  <% post.titles.select(&:persisted?).each do |title| %>
+    <%= render 'admin/posts/titles/title', title: title %>
+  <% end %>
+</ul>
+

data/lib/ecrire/app/views/admin/posts/titles/index.html.erb

@@ -1,38 +1,3 @@
-<% content_for :class, 'posts view' %>
-
-<%= content_tag :header do |header| %>
-  <nav>
-    <div class='meta'>
-      <%= link_to 'Edit', edit_admin_post_path(@post), class: %w(button) %>
-      <%= link_to 'Preview', admin_post_path(@post), class: %w(button) %>
-      <%= link_to 'Tags', admin_post_tags_path(@post), class: %w(button) %>
-      <%= link_to 'Title', admin_post_titles_path(@post), class: %w(selected button) %>
-    </div>
-
-    <%= content_tag :div, class: %w(publish state), href: admin_post_toggle_path(@post), method: :put, published: @post.published?, as: 'Post.Publish' do %>
-      <label>Published</label>
-      <label>Draft</label>
-    <% end %>
-  </nav>
-
-  <%= content_tag :h2, @post.title %>
-
-  <% if @post.header? %>
-    <% header[:style] = "background-image: url(#{@post.header.url});" %>
-  <% end %>
-<% end %>
-
-<section>
-  <% if @post.published? %>
-    <%= render 'admin/posts/titles/form', title: @title, url: admin_post_titles_path(@post) %>
-  <% else %>
-    <%= render 'admin/posts/titles/form', title: @title, url: admin_post_title_path(@post, @title) %>
-  <% end %>
-
-  <h3>Titles for this post</h3>
-  <ul class='titles'>
-    <% @post.titles.select(&:persisted?).each do |title| %>
-      <%= render 'admin/posts/titles/title', title: title %>
-    <% end %>
-  </ul>
+<section class='titles'>
+  <%= render 'admin/posts/titles/index', post: @post, title: @title %>
 </section>

data/lib/ecrire/app/views/admin/posts/titles/index.js.erb

@@ -0,0 +1,2 @@
+e.HTML = "<%= j popup_tag(render('admin/posts/titles/index', post: @post, title: @title), class: %w(popup titles)) %>".toHTML()
+

data/lib/ecrire/app/views/admin/posts/titles/update.js.erb

@@ -0,0 +1 @@
+e.HTML = "<%= j render('admin/posts/titles/titles', post: @post, title: @title) %>".toHTML()

data/lib/ecrire/app/views/admin/tags/_tags.html.erb

@@ -1,10 +1,6 @@
-<div class='overlay' as='Overlay'>
-  <div class='popup' id='TagsList'>
-    <h2>Tags</h2>
-    <ul>
-      <% tags.each do |tag| %>
-        <%= render 'admin/tags/tag', tag: tag %>
-      <% end %>
-    </ul>
-  </div>
-</div>
+<h2>Tags</h2>
+<ul>
+  <% tags.each do |tag| %>
+    <%= render 'admin/tags/tag', tag: tag %>
+  <% end %>
+</ul>

data/lib/ecrire/app/views/admin/tags/index.js.erb

@@ -1 +1 @@
-e.HTML = "<%= j render('admin/tags/tags', tags: @tags) %>".toHTML()
+e.HTML = "<%= j popup_tag(render('admin/tags/tags', tags: @tags)) %>".toHTML()

data/lib/ecrire/app/views/layouts/admin/application.html.erb

@@ -2,7 +2,7 @@
 <html>
   <head>
     <title>Ecrire</title>
-    <link rel="shortcut icon" href="<%= url_for("/favicon.ico")%>" />
+    <link rel="shortcut icon" href="<%= image_url("favicon.ico")%>" />
     <%= stylesheet_link_tag    "admin", media: "all" %>
     <%= javascript_include_tag "admin" %>
     <%= csrf_meta_tags %>

data/lib/ecrire/application.rb

@@ -24,8 +24,6 @@ module Ecrire
   class Application < Rails::Application
     require 'ecrire/config/environment'
 
-    alias :require_environment! :initialize!
-
     config.before_initialize do
       if paths['config/database'].existent.any?
         require 'ecrire/theme/engine'

data/lib/ecrire/commands/console.rb

@@ -11,7 +11,7 @@ module Ecrire
         require 'rails/commands/console'
 
         shift_argv!
-        Ecrire::Application.require_environment!
+        Ecrire::Application.initialize!
 
         Rails::Console.start(Ecrire::Application, *ARGV)
       end

data/lib/ecrire/config/environment/development.rb

@@ -1,3 +1,5 @@
+require 'byebug'
+
 Ecrire::Application.configure do
   config.cache_classes = false
   config.eager_load = false

data/lib/ecrire/db/migrate/20140618321984_add_properties_to_posts.rb

@@ -1,6 +1,6 @@
 class AddPropertiesToPosts < ActiveRecord::Migration
   def change
-    execute 'CREATE EXTENSION hstore'
+    execute 'CREATE EXTENSION IF NOT EXISTS hstore'
     add_column :posts, :properties, :hstore
   end
 end

data/lib/ecrire/onboarding/assets/stylesheets/shared/base.scss

@@ -8,8 +8,8 @@
 }
 
 html, body {
-  display: flex;
-  flex: 1 auto;
+  @include display(flex);
+  @include flex(1 auto);
   margin: 0;
   padding: 0;
   font-family: Baskerville;
@@ -19,12 +19,6 @@ html {
   height: 100vh;
 }
 
-body {
-  @include display(flex);
-  @include align-items(center);
-  @include justify-content(center);
-}
-
 a {
   color: rgb(114, 153, 204);
 }
@@ -56,8 +50,15 @@ body {
   font-size: 13px;
   background: #F3F0EA;
   color: #313126;
-  flex-direction: column;
-  display: flex;
+
+  @include display(flex);
+  @include align-items(center);
+  @include justify-content(center);
+  @include flex-direction(column);
+
+  & > main {
+    width: 100%;
+  }
 
   section {
     margin: 0 auto;

data/lib/ecrire/onboarding/assets/stylesheets/shared/complete.scss

@@ -1,3 +1,4 @@
 #OnboardingIndex section.complete {
+  margin: 0 auto;
   font-size: 1.4em;
 }

data/lib/ecrire/onboarding/assets/stylesheets/shared/welcome.scss

@@ -31,7 +31,7 @@
     @include align-items(center);
     @include justify-content(center);
     @include flex-direction(column);
-    margin: 3em 0 0 0;
+    margin: 3em auto 0 auto;
     min-height: 50vh;
     min-width: 60vw;
     &.welcome {

data/lib/ecrire/routes.rb

@@ -13,7 +13,7 @@ Ecrire::Application.routes.draw do
           get 'help', controller: :posts, action: :help
         end
 
-        resources :tags, only: [:index], module: 'posts' do
+        resources :tags, only: [:index, :create], module: 'posts' do
           put :toggle
         end
 

data/lib/ecrire/theme/template/assets/stylesheets/shared/{base.css.scss → base.scss}

@@ -2,6 +2,10 @@
   box-sizing: border-box;
 }
 
+html {
+  min-height: 100%;
+}
+
 html, body {
   @include display(flex);
   @include flex(1);
@@ -122,22 +126,4 @@ main.customize article {
   @include flex-direction(column);
   max-width:900px;
   margin: 0 auto;
-
-  pre {
-    background-color: $gray-blue;
-    padding: 0;
-
-    header {
-      text-align: center;
-      font-size: 0.8em;
-      font-style: italic;
-      padding: 0.5em 1em;
-      background-color: $light-gray-blue;
-    }
-
-    code {
-      padding: 1em;
-      display: block;
-    }
-  }
 }

data/lib/ecrire/theme/template/assets/stylesheets/shared/code.scss

@@ -0,0 +1,33 @@
+pre {
+  background-color: $gray-blue;
+  padding: 0;
+
+  header {
+    text-align: center;
+    font-size: 0.8em;
+    font-style: italic;
+    padding: 0.5em 1em;
+    background-color: $light-gray-blue;
+  }
+
+  code {
+    padding: 1em;
+    display: block;
+  }
+}
+
+:not(pre) > code {
+  background-color: $gray-blue;
+  padding: 0.1em 0.5em;
+  border-radius: 3px;
+  font-size: 0.9em;
+}
+
+pre > code, pre > header {
+  font-size: 0.8em;
+}
+
+pre > header {
+  word-wrap: break-word;
+}
+

data/lib/ecrire/theme/template/assets/stylesheets/shared/{header.css.scss → header.scss}

@@ -2,21 +2,31 @@ main > header {
   @include display(flex);
   @include flex-direction(column);
 
-  padding: 2em 1em;
+  padding: 0 1em 2em 0;
+  font-size: 1.2em;
   background-color: $navy-blue;
   color: $light-blue;
+  min-height: 300px;
+  height: 30vh;
 
   nav {
     @include display(flex);
+    @include flex(1 auto);
+    @include flex-direction(column);
     @include justify-content(space-between);
     @include align-items(center);
 
-    h1, ol {
+    ol {
       margin: 0;
     }
 
-    h1 {
+    a.logo {
       font-family: courier;
+      font-size: 10em;
+      text-decoration: none;
+      margin: auto 0;
+      line-height: 100%;
+      color: lighten($navy-blue, 10%);
     }
 
     ol {

data/lib/ecrire/theme/template/assets/stylesheets/shared/{posts.css.scss → posts.scss}

@@ -25,6 +25,16 @@ ol.posts {
   }
 }
 
+div.posts.empty {
+  @include flex(1);
+  @include align-items(center);
+  @include justify-content(center);
+  p {
+    color: darken($light-gray-blue, 15%);
+    text-shadow: 0 1px 0 lighten($light-gray-blue, 15%);
+  }
+}
+
 ol.posts li.latest {
   margin: 6em 0;
   background: $light-gray-blue;

data/lib/ecrire/theme/template/controllers/posts_controller.rb

@@ -3,10 +3,6 @@ class PostsController < Ecrire::ThemeController
 
   def index
     @posts = posts.published.includes(:titles).order('published_at DESC').page(params[:page]).per(params[:per])
-    if params[:page] == 1
-      @latest = @posts.first
-      @posts = @posts.where.not(id: @latest.id)
-    end
     @tags = Tag.all
 
     respond_to do |format|

data/lib/ecrire/theme/template/secrets.yml

@@ -2,10 +2,10 @@
 development: &1
   adapter: postgresql
   database: ecrire
-  user: postgres
-  password: a69164528b8b6622e730f722c5d88386
+  user: ''
+  password: ''
   encoding: utf8
-  secret_key: 7681ee4652c6f230cfdb96127826c438
-  secret_key_base: 7681ee4652c6f230cfdb96127826c438
+  secret_key: 0e597dc0e17ad5af51d0f25b5a479044
+  secret_key_base: 0e597dc0e17ad5af51d0f25b5a479044
 test: *1
 production: *1

data/lib/ecrire/theme/template/views/layouts/application.html.erb

@@ -23,10 +23,10 @@
       <header>
 
         <nav>
-          <h1><%= link_to 'E', '/' %></h1>
+          <%= link_to 'E', '/', class: %w(logo) %>
 
           <ol>
-            <li><%= link_to 'Customize', '/customize' %></li>
+            <li><%= link_to 'Get started', '/customize' %></li>
 
             <% if !signed_in? %>
               <li><%= link_to 'Log in', new_session_path %></li>

data/lib/ecrire/version.rb

@@ -1,3 +1,3 @@
 module Ecrire
-  VERSION = '0.28.3'
+  VERSION = '0.29.0'
 end

data/lib/ecrire.rb

@@ -16,6 +16,7 @@ module Ecrire
     require 'bundler/setup'
     require 'rails/all'
 
+    require 'jbuilder'
     require 'bourbon'
     require 'sass-rails'
     require 'sprockets'

data/test/editor/models/post_test.rb

@@ -42,7 +42,7 @@ class PostTest < ActiveSupport::TestCase
   end
 
   test "fetch draft post" do
-    @posts = Post.status("draft")
+    @posts = Post.status("drafted")
     assert_equal @posts.count, Post.drafted.count
     @posts.each do |post|
       assert post.draft?

data/test/theme/theme/views/layouts/application.html.erb

@@ -0,0 +1 @@
+<%= yield %>