ecrire 0.31.1 → 0.31.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71fe436833035976d884e26021bfa8b131ca568f
-  data.tar.gz: 9eea7a3373992ab294b4756fe1c42921874ecdf2
+  metadata.gz: 0f86c23ff46a5a0ca670049fc4ef6d0e18715df3
+  data.tar.gz: 8324aeb7ec6567a5ae359e7f3f436238997d819e
 SHA512:
-  metadata.gz: b4ba6980d252fba844d659ad2b0852376a64de90f62c25d58c94332ffd8769e08b0e1d29d2c81326f22015b81765d26b30a25a3ba08b1a69e40efa706aa1ebe5
-  data.tar.gz: f996b820cbcd19596240b85a762321c8aa1d4939d034b9dc4868197813f22182912a340f748f2296eaefe28965011e49f5b94b006c75b49e964c7c2cc0e9b699
+  metadata.gz: 6aafa4fb63b437092c4d95218e86328575bdfcaae15f017a02df5c1bbcd96315c1d93df0bea01769b1eda1dd78d60dcb8982fee1a3bc12d7dc496a70b1294ff6
+  data.tar.gz: 020e45b5558dbae6b12f6c81554b545de660bc20c4a5131fc2b37959eab9b5d070188e00b6d8d5633f6496f632b481c87d959aacd18c379363bc0edf6cbc89b5

data/.gitignore

@@ -22,3 +22,6 @@ Gemfile.lock
 lib/**/secrets.yml
 
 /lib/ecrire/template/secrets.yml
+.byebug_history
+*.gem
+.ruby-version

data/Gemfile

@@ -4,7 +4,8 @@ gemspec
 
 gem 'rails'
 gem 'observejs',         git: 'https://github.com/pothibo/observejs.git'
-gem 'written'
+gem 'written',           git: 'https://github.com/pothibo/written.git'
+gem 'autoprefixer-rails'
 gem 'warden'
 gem 'bcrypt'
 gem 'nokogiri'

data/Rakefile

@@ -3,63 +3,18 @@ $:.push File.expand_path("../lib", __FILE__)
 ENV['RAILS_ENV'] ||= 'test'
 
 require 'ecrire'
-require_relative 'test/configuration'
 require_relative 'test/task'
 
 task default: :test
 
-namespace :database do
-    secrets = YAML.load_file(File.expand_path('../test/secrets.yml', __FILE__))
-    info = secrets[ENV['RAILS_ENV']]
-    postgresql = Ecrire::Test::Configuration::Postgresql.new(info['database'], info['username'])
-
-  task :initialize do
-    begin
-      unless postgresql.configured?
-        puts "It seems you are running the development tests for the first time."
-        puts "Ecrire will try to configure postgresql for you..."
-
-        data = YAML.load_file(File.expand_path('../test/secrets.yml', __FILE__))
-
-        if postgresql.user.new?
-          postgresql.create_user!
-        end
-
-        if !postgresql.user.superuser?
-          postgresql.user.superuser!
-        end
-
-        if !postgresql.user.login?
-          postgresql.user.login!
-        end
-
-        puts "Done configuring postgresql."
-      end
-
-      postgresql.reset_database!
-    rescue Ecrire::Test::Configuration::Error => e
-      puts "Ecrire couldn't configure postgresql."
-      puts "=> #{e.message}"
-      puts "To fix this issue, make sure you have a superuser for #{%x(whoami)}"
-      puts "createuser -l -s postgres"
-      exit
-    end
-  end
-
-end
-
 namespace :test do
   ['editor', 'onboarding', 'theme'].each do |name|
     Ecrire::Test::Task.new(name) do |t|
-      t.before do
-        Rake::Task['database:initialize'].invoke
-      end
       t.libs << "test"
       t.test_files = FileList["test/#{name}/**/*_test.rb"]
       t.verbose = true
     end
   end
-
 end
 
 task :test do
@@ -74,6 +29,7 @@ namespace :template do
   task :server do
     require 'ecrire/commands/server'
     Dir.chdir 'lib/ecrire/theme/template'
+    ENV[Ecrire::SECRET_ENVIRONMENT_KEY] = {onboarding: false}.to_json
     Rails.env = ENV['RAILS_ENV'] = 'development'
     Ecrire::Commands::Server.new(Port: 3000).run!
   end

data/lib/ecrire.rb

@@ -1,6 +1,18 @@
 module Ecrire
+  SECRET_ENVIRONMENT_KEY = 'ECRIRE_SECRETS'.freeze
 
   autoload :Application,        'ecrire/application'
+  autoload :Configuration,      'ecrire/configuration'
+
+  module Theme
+    def self.path=(pathname)
+      @@path = pathname
+    end
+
+    def self.path
+      @@path ||= Pathname.new(Dir.pwd)
+    end
+  end
 
   ##
   # Returns true if Ecrire could find 

data/lib/ecrire/app/assets/javascripts/admin/posts/content.coffee

@@ -1,11 +1,5 @@
 ObserveJS.bind 'Editor.Content', class
   loaded: =>
-    Written.Parsers.get('pre').highlightWith (element) ->
-      Prism.highlightElement(element, false)
-
-    Written.Parsers.get('code').highlightWith (element) ->
-      Prism.highlightElement(element, false)
-
     if @element().dataset.bucket?
       window.AWS = {
         bucket: @element().dataset.bucket,
@@ -15,4 +9,10 @@ ObserveJS.bind 'Editor.Content', class
       }
 
     @written = new Written(this.element())
-    @written.initialize()
+
+    @written.parsers.get('pre')?.highlightWith (element) ->
+        Prism.highlightElement(element, false)
+
+    @written.parsers.get('code')?.highlightWith (element) ->
+        Prism.highlightElement(element, false)
+

data/lib/ecrire/app/assets/javascripts/admin/posts/header.coffee

@@ -63,7 +63,7 @@ ObserveJS.bind 'Post.Header', class
     @hide(@template('div.status.uploading'))
     @show(@template('div.error.status'))
     ul = @template('div.error.status').querySelector('ul')
-    @on 'click', @template('div.error.status').querySelector('button'), @clear
+    @on 'click', @element().querySelector('div.error.status button'), @clear
     for error in errors
       ul.insertAdjacentHTML('beforeend', "<li>#{error}</li>")
 

data/lib/ecrire/app/assets/stylesheets/admin/base.scss

@@ -1,3 +1,5 @@
+@import 'navigation/**/*';
+
 * {
   box-sizing: border-box;
   -moz-box-sizing: border-box;
@@ -14,7 +16,6 @@ html {
 }
 
 body {
-  @include background(linear-gradient(darken($bright-blue, 5%), $bright-blue));
 
   margin: 0;
   padding: 0;
@@ -123,17 +124,25 @@ main {
 
   position: relative;
   z-index: 1;
+  padding-top: 52px;
 
   top: 0;
   left:0;
   right:0;
   bottom:0;
+
+  &[data-style='split'] {
+    flex-direction: row;
+  }
+
+  &:not([data-style='split']) {
+    flex-direction: column;
+  }
 }
 
 main > section {
-  @include flex(0 1 60vw);
+  flex: 1 auto;
   background: white;
-  margin: 0 auto 0 0;
 }
 
 .hidden {

data/lib/ecrire/app/assets/stylesheets/admin/navigation.scss

@@ -1,34 +1,3 @@
-#AdminNavigation {
-  @include display(flex);
-  @include flex-direction(column);
-  @include flex(1 0 180px);
-  max-width: 200px;
-  margin-left: auto;
-  color: $light-blue;
-  border-left: 1px solid rgba(0,0,0,0.1);
-}
-
-#AdminNavigation > a.home {
-  @include display(flex);
-  @include align-items(center);
-  @include justify-content(center);
-
-  padding: 12px 8px;
-
-  &:hover > svg {
-    fill: lighten($light-blue, 45%);
-  }
-
-  & > svg {
-    @include transition(fill 0.2s ease-in);
-    width: 14px;
-    height: 14px;
-    margin-right: 12px;
-
-    fill: $light-blue;
-  }
-}
-
 #AdminNavigation > div.current.user {
   position: relative;
   margin: 1vh 5% 0 5%;

data/lib/ecrire/app/assets/stylesheets/admin/navigation/base.scss

@@ -0,0 +1,30 @@
+#AdminNavigation {
+  z-index: 100;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  height: 52px;
+
+  padding: 0 12px;
+
+  background: $bright-blue;
+  border-bottom: 1px solid darken($bright-blue, 15%);
+}
+
+#AdminNavigation a:not(.home):not(.profile) {
+  font-weight: bold;
+}
+
+#AdminNavigation > div {
+  display: flex;
+  align-items: center;
+  margin: 0 auto;
+  justify-content: space-around;
+
+  flex: 0 30%;
+}

data/lib/ecrire/app/assets/stylesheets/admin/navigation/home.scss

@@ -0,0 +1,22 @@
+#AdminNavigation > a.home {
+  @include display(flex);
+  @include align-items(center);
+  @include justify-content(center);
+
+  padding: 12px 0;
+
+  &:hover > svg {
+    fill: lighten($light-blue, 45%);
+  }
+
+  & > svg {
+    @include transition(fill 0.2s ease-in);
+    width: 14px;
+    height: 14px;
+    margin-right: 12px;
+
+    fill: $light-blue;
+  }
+}
+
+

data/lib/ecrire/app/assets/stylesheets/admin/posts.scss

@@ -16,56 +16,6 @@
   margin-top: 214px;
 }
 
-#PostsIndexList ul.posts {
-  @include flex(1);
-  @include display(flex);
-  @include flex-direction(column);
-  width: 100%;
-}
-
-
-#PostsIndexList > ul.posts li {
-  @include display(flex);
-  @include flex-direction(column);
-  @include justify-content(center);
-  border-bottom: 1px solid rgba($gray-blue, 0.2);
-  padding: 1% 2%; min-height: 80px;
-}
-
-#PostsIndexList > ul.posts li:nth-child(even) {
-  background: lighten($gray-blue, 40%);
-}
-
-#PostsIndexList > ul.posts li > a {
-  font-size: 2em;
-  margin: 8px 0;
-}
-
-#PostsIndexList > ul.posts li > div.info {
-  @include display(flex);
-  @include align-items(center);
-
-  & > span.tags {
-    @include flex(1);
-
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    overflow: hidden;
-    margin: 0;
-  }
-
-  & > span.status {
-    @include flex(0 auto);
-    margin-left: auto;
-  }
-}
-
-#PostsIndexList > ul.posts li > span.tags svg {
-  width: 14px;
-  height: 14px;
-  fill: $gray-blue;
-}
-
 body.posts section.new.post {
   @include display(flex);
 }

data/lib/ecrire/app/assets/stylesheets/admin/posts/aside.scss

@@ -0,0 +1,36 @@
+body.posts main > aside {
+  display: flex;
+  flex-direction: column;
+  width: 10vw;
+  min-width: 200px;
+  max-width: 400px;
+  padding: 5vh 12px;
+  border-right: 1px solid $light-gray;
+  margin-left: auto;
+}
+
+body.posts main aside > a.new {
+  background-color: $bright-blue;
+  text-align: center;
+  font-weight: bold;
+  margin-bottom: 24px;
+
+  &:hover {
+    background-color: $bright-blue
+  }
+}
+
+body.posts main aside > ol {
+  display: flex;
+  flex-direction: column;
+  margin: 4px 12px;
+}
+
+body.posts main aside ol > li {
+  margin: 4px;
+  padding: 0;
+}
+
+body.posts main aside ol li > a.selected {
+  font-weight: bold;
+}

data/lib/ecrire/app/assets/stylesheets/admin/posts/editor.scss

@@ -0,0 +1,4 @@
+body.edit.posts main > section {
+  width: 80vw;
+  padding-bottom: 10rem;
+}

data/lib/ecrire/app/assets/stylesheets/admin/posts/header.scss

@@ -7,7 +7,7 @@
   @include transition(background-color 0.3s ease);
 
   position: fixed;
-  top: 0;
+  top: 52px;
   left: 0;
   right: 0;
   width: 100%;
@@ -25,6 +25,7 @@
 }
 
 [as='Post.Header'] > nav.actions {
+  top: 0;
   font-weight: bold;
 }
 

data/lib/ecrire/app/assets/stylesheets/admin/posts/list.scss

@@ -0,0 +1,61 @@
+body.posts main.list > section {
+  min-width: 400px;
+  max-width: 700px;
+  width: 90%;
+  margin: 0 auto 0 0;
+}
+
+body.posts main.list section > h2 {
+  font-size: 1.2em;
+  text-align: center;
+  margin: 2em 0;
+  color: $gray-blue;
+}
+
+body.posts main.list section > ul.posts {
+  @include flex(1);
+  @include display(flex);
+  @include flex-direction(column);
+  width: 90%;
+  margin: 0 auto;
+}
+
+
+body.posts main.list section ul.posts > li {
+  @include display(flex);
+  @include flex-direction(column);
+  @include justify-content(center);
+  border-bottom: 1px solid rgba($gray-blue, 0.2);
+  min-height: 80px;
+}
+
+#PostsIndexList > ul.posts li > a {
+  font-size: 2em;
+  margin: 8px 0;
+}
+
+#PostsIndexList > ul.posts li > div.info {
+  @include display(flex);
+  @include align-items(center);
+
+  & > span.tags {
+    @include flex(1);
+
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    margin: 0;
+  }
+
+  & > span.status {
+    @include flex(0 auto);
+    margin-left: auto;
+  }
+}
+
+#PostsIndexList > ul.posts li > span.tags svg {
+  width: 14px;
+  height: 14px;
+  fill: $gray-blue;
+}
+