hyde_admin 0.0.1 → 0.0.3

data/bin/hyde_admin.ru

@@ -2,86 +2,251 @@
 # lancer avec rackup
 require "roda"
 require 'yaml'
+require 'fileutils'
+require 'i18n'
+require 'date'
+require_relative '../lib/hyde_admin/version'
+
+# TODO détecter format nouveau post (pour codemirror)
 
 class App < Roda
   YML_FILE_NAME = "hyde_admin.yml"
 
   plugin :render,
     #escape: true, # Automatically escape output in erb templates using Erubi's escaping support
-    views: 'admin_views', # Default views directory
+    views: File.join(File.expand_path(File.dirname(__FILE__)),'admin_views'), # Default views directory
     layout_opts: {template: 'admin_layout', engine: 'html.erb'},    # Default layout options
     template_opts: {default_encoding: 'UTF-8'} # Default template options
-
-    plugin :i18n, translations: './i18n'  # gem 'roda-i18n'
-
-    opts[:root] = Dir.pwd
-
-    plugin :public, root: "#{YAML.load(File.read(YML_FILE_NAME))['path_to_jekyll_src']}/_site" # permet de simuler le serveur jekyll
-
-  # TODO load option (default_layout, deploy_dest_address, deploy_dest_path, path_to_jekyll_src, rsync_fullpath)
-  # expliquer dans la doc le hyde.yml (voir une commande pour le prégénérer)
+  plugin :i18n, translations: File.join(File.expand_path(File.dirname(__FILE__)), 'i18n') # gem 'roda-i18n'
+  opts[:root] = Dir.pwd
+  plugin :public, root: File.join(Dir.pwd, '_site') # simulate jekyll site
+  plugin :static, ['/mode', '/lib', '/fslightbox', '/hyde_assets'], :root => File.join(File.expand_path(File.dirname(__FILE__)))
+  plugin :http_auth
+  plugin :common_logger
 
   def initialize(param)
-    puts "============> #{Dir.pwd}"
     yml_in_current_dir = File.join(Dir.pwd, YML_FILE_NAME)
     yml_in_gem = File.expand_path(File.join(File.dirname(__FILE__), YML_FILE_NAME))
 
-    puts yml_in_current_dir
-    puts yml_in_gem
-
     # Generate default YML for hyde_admin
     if !File.exist?(yml_in_current_dir)
-      File.cp(yml_in_gem, yml_in_current_dir)
+      FileUtils.cp(yml_in_gem, yml_in_current_dir)
     end
     @hyde_parameters ||= YAML.load(File.read(yml_in_current_dir))
     super(param)
   end
 
+  def self.transliterate_title_for_url(title)
+    I18n.config.available_locales = :en
+    I18n.transliterate(title).downcase.gsub(/[^a-zA-Z ]/,'').gsub(' ','-')
+  end
+
+  def self.urlize(date_str, title, with_date = true)
+    url_str = ""
+    if with_date
+      url_str += "#{Date.parse(date_str).strftime('%Y-%m-%d')}-"
+    end
+    url_str += "#{self.transliterate_title_for_url(title)}"
+    url_str
+  end
+
+  def self.extract_header_str(str)
+    str.scan(/---(.*?)---/m).flatten.first
+  end
+
+  def self.extract_header(str)
+    headers = App.extract_header_str(str).to_s.split("\n")
+    headers = headers.select{ |header| !header.empty? }.map{ |header| header.scan(/([a-zA-Z0-9]*): (.*)/).flatten }.select{ |header| !header.empty? }
+    hsh_headers = {}
+    if !headers.flatten.empty?
+      #$stderr.puts "==============="
+      #$stderr.puts headers.inspect
+      hsh_headers = Hash[headers]
+    end
+    hsh_headers
+  end
+
+  def self.remove_header(str)
+    str.gsub(/---(.*?)---/m, "")
+  end
+
+  FORMAT_DATE_FILENAME = '%Y-%m-%d'
+  FORMAT_DATE_INPUT_FILENAME = '%Y-%m-%d %H:%M:%S %z'
+
+  REGEXP_EXTRACT_DATE_FROM_FILENAME = /\d{4}-\d{2}-\d{2}-/
+  REGEXP_EXTRACT_DATE_TITLE_FROM_FILENAME = /(\d{4}-\d{2}-\d{2}-)(.*)(\.[^.]*)$/
+
   route do |r|
-    # GET serve static blog (chercher l'url index.html dans le navigateur
+    @page = r.params['page']
+
+    if @hyde_parameters['hyde_admin_auth'].to_s == 'true'
+      http_auth {|u, p| [u, p] == [@hyde_parameters['hyde_admin_user'], @hyde_parameters['hyde_admin_password']] }
+    end
+
+    # GET serve jekyll site
     r.public
 
+    r.i18n_set_locale(@hyde_parameters['hyde_admin_language']) do
+
     r.root do
       r.redirect "/dashboard"
     end
 
+    # Redirect to jekyll index site
     r.on "overview" do
       r.redirect @hyde_parameters['site_index']
     end
-    
-    # need to install jekyll (version bundlé avec le site
+
+    # Rebuild static files
     r.on "rebuild" do
-      puts @hyde_parameters['path_to_jekyll_src']
-      `cd #{@hyde_parameters['path_to_jekyll_src']} && jekyll b && sleep 10`
+      puts Dir.pwd
+      `cd #{Dir.pwd} && jekyll b`
       r.redirect "/dashboard"
     end
 
     r.on "deploy" do
-      `#{@hyde_parameters['rsync_fullpath']} #{@hyde_parameters['path_to_jekyll_src']}/_site/ #{@hyde_parameters['deploy_dest_user']}@#{@hyde_parameters['deploy_dest_address']}:#{@hyde_parameters['deploy_dest_path']}`
+      `#{@hyde_parameters['rsync_fullpath']} #{Dir.pwd}/_site/ #{@hyde_parameters['deploy_dest_user']}@#{@hyde_parameters['deploy_dest_address']}:#{@hyde_parameters['deploy_dest_path']}`
       r.redirect "/dashboard"
     end
 
-    r.on "configuration" do
-      File.open("hyde.yml","w+") do |f|
+    r.post "configuration" do
+      r.params.each_pair do |k,v|
+        @hyde_parameters[k] = v
+      end
+      File.open(File.join(Dir.pwd, YML_FILE_NAME),"w+") do |f|
         f.write(@hyde_parameters.to_yaml)
       end
-      r.redirect "/dashboard"
+      r.redirect "/configuration"
+    end
+
+    r.get "configuration" do
+      view("configuration")
     end
 
     r.on "dashboard" do
       view("dashboard")
     end
 
+    r.on "files" do
+      @dir_path = r.params['dir_path'] || Dir.pwd
+
+      # List files
+      r.get "index" do
+        @files = Dir[File.join(@dir_path, '*')].sort(&:casecmp).reverse
+        @parent_dir = (@dir_path != Dir.pwd)
+        view("files/listing")
+      end
+
+      # Upload files
+      r.post "create" do
+        files = [r.params['files']].flatten # 1 or more files
+        files.each do |file|
+          File.open(File.join(@dir_path, file[:filename]), 'wb') do |f|
+            f.write(file[:tempfile].read)
+          end
+        end
+        r.redirect "/files/index?dir_path=#{@dir_path}"
+      end
+
+      # Create directory
+      r.post "create_dir" do
+        Dir.mkdir(File.join(@dir_path, r.params['directory_name']))
+        r.redirect "/files/index?dir_path=#{@dir_path}"
+      end
+
+      # Create file
+      r.post "create_file" do
+        fullpath = File.join(@dir_path, r.params['file_name'])
+        File.open(fullpath, 'w+') do |f|
+          f.write("")
+        end
+        r.redirect "/files/edit?dir_path=#{@dir_path}&file=#{fullpath}"
+      end
+
+      # Edit text files
+      r.get "edit" do
+        @file = r.params['file']
+        @content = File.read(@file)
+        @header = App.extract_header_str(@content)
+        @content = App.remove_header(@content)
+        @has_header = (!@header.nil? && !@header.empty?)
+        @has_editor = ['.html','.md'].include?(File.extname(@file))
+        view("files/edit")
+      end
+
+      # Update file
+      r.post "update" do
+        @file = r.params['file']
+        @content = r.params['content']
+        @header = r.params['header']
+        File.open(@file,"w+") do |f|
+          if !@header.nil? and !@header.empty?
+            f.write("---")
+            f.write(@header)
+            f.write("---")
+            f.write("")
+          end
+          f.write(@content)
+        end
+        view("files/edit")
+      end
+
+      # Delete
+      r.post "delete" do
+        file = r.params['file']
+        File.unlink(file)
+        r.redirect "/files/index?dir_path=#{@dir_path}"
+      end
+    end
+
+    r.on "ajax" do
+      r.post "update_path_date" do
+        path = r.params['path']
+        date = Date.parse(r.params['date'])
+        new_path = path.gsub(REGEXP_EXTRACT_DATE_FROM_FILENAME, date.strftime("#{FORMAT_DATE_FILENAME}-"))
+        response.write(new_path)
+      end
+      r.post "update_path_title" do
+        path = r.params['path']
+        title = r.params['title']
+        I18n.config.available_locales = :en
+        new_path = path.gsub(REGEXP_EXTRACT_DATE_TITLE_FROM_FILENAME, "\\1#{App.transliterate_title_for_url(title)}\\3")
+        response.write(new_path)
+      end
+      r.post "update_date_today" do
+        date = Time.now.strftime(FORMAT_DATE_INPUT_FILENAME)
+        response.write(date)
+      end
+    end
+
     # Posts/pages/drafts
     r.on /posts|pages|drafts/ do
       # Set variable for all routes in /hello branch
       @type_file = r.matched_path.split('/').compact.select{ |elt| elt != '' }.first
 
+      # Mkdir _pages _drafts _posts if they not exist
+      FileUtils.mkdir_p(File.join(Dir.pwd, "_#{@type_file}"))
+
       # GET /posts/index request
       # list all posts...
       r.get "index" do
-        @files = Dir[File.join(@hyde_parameters['path_to_jekyll_src'], "_#{@type_file}", '*')].sort
-        view("listing")
+        @files = Dir[File.join(Dir.pwd, "_#{@type_file}", '*')].sort.reverse
+        view("posts/listing")
+      end
+
+      r.get "new" do
+        @file = ""
+        @headers = {}
+        @new_record = @file.empty?
+        view("posts/edit")
+      end
+
+      # POST /posts/delete?file=truc request
+      # save the truc post
+      r.post "delete" do
+        @file = r.params['file']
+        File.unlink(@file)
+        r.redirect "/#{@type_file}/index?dir_path=#{File.dirname(@file)}"
       end
 
       r.is do
@@ -91,52 +256,75 @@ class App < Roda
           @file = r.params['file']
 
           content_file = File.read(@file)
-          @headers = content_file.scan(/---(.*?)---/m).flatten.first.split("\n")
-          @headers = @headers.select{ |header| !header.empty? }.map{ |header| header.scan(/([a-zA-Z]*): (.*)/).flatten }
-          pp @headers
-          @headers = Hash[@headers]
-          
-          view("edit")
+          @headers = App.extract_header(content_file)
+          @content = File.read(@file).gsub(/---(.*?)---/m, "")
+
+          # for page
+          if @headers.empty?
+            r.redirect "/files/edit?dir_path=#{r.params['dir_path']}&file=#{@file}"
+          else
+            @new_record = @file.empty?
+            view("posts/edit")
+          end
         end
 
         # POST /posts?file=truc request
         # save the truc post
         r.post do
-          @file = r.params['file']
-          @content = r.params['content']
-          @filename = r.params['filename']
-          @tags = r.params['tags']
-          @content = r.params['content']
-          @date = r.params['date']
-          @meta = r.params['meta']
-          @format = r.params['format']
-          @publish = r.params['publish']
-          @layout = r.params['layout']
+          @file = r.params.delete('file') # in a route (new record : empty ELSE old filename)
+          @content = r.params.delete('content')
+          @filename = r.params.delete('filename')
+          @tags = r.params.delete('tags')
+          @date = r.params.delete('date')
+          @meta = r.params.delete('meta')
+          @format = r.params.delete('format')
+          @publish = r.params.delete('publish')
+          @layout = r.params.delete('layout')
+          @title = r.params.delete('title')
+          @new_file = r.params.delete('new_file') # form (new record : empty ELSE new filename)
+
+          #$stderr.puts "---->"
+
+          if @new_file.nil? || @new_file.empty?
+            filename = App.urlize(@date, @title, (@type_file != 'pages'))
+            @new_file = File.join(Dir.pwd,"_#{@type_file}", "#{filename}.#{@format}")
+          end
 
           @headers = ['---']
-          @headers << ['tags', @tags.join(',')].join(': ')
+          @headers << ['tags', @tags.split(',').map(&:strip).join(',')].join(': ')
           @headers << ['layout', @layout].join(': ')
           @headers << ['date', @date.to_s].join(': ')
-          #@headers << ['meta', @tags.join(',')].join(': ')
+          @headers << ['title', @title.to_s].join(': ')
+          r.params.each do |k,v|
+            if k.start_with?('header')
+              @headers << [v.first, v.last.to_s].join(': ')
+            else
+              @headers << [k, v.to_s].join(': ')
+            end
+          end
           @headers << ['---']
+          @headers << ['']
 
-          File.open(File.join(@hyde_parameters['path_to_jekyll_src'], "#{@file}.#{@format}"), "w+") do |f|
+          File.open(@new_file, "w+") do |f|
             f.write(@headers.join("\n"))
-            f.write("")
-            f.write(content)
+            f.write(@content)
           end
-        end
 
-        # POST /posts/delete?file=truc request
-        # save the truc post
-        r.post "delete" do
-          @file = r.params['file']
-          File.unlink(File.join(@hyde_parameters['path_to_jekyll_src'],@file))
+          # Change path of file
+          if !@file.to_s.empty? && @new_file.to_s != @file.to_s
+            File.unlink(@file)
+          end
+
+          # publish : move draft to post
+          if @publish == 'publish' && @new_file.to_s.include?('_drafts')
+            FileUtils.mv(@new_file, @new_file.gsub('_drafts','_posts'))
+          end
+
+          r.redirect "/#{@type_file}/index?dir_path=#{File.dirname(@new_file)}"
         end
       end
     end
-
-    # TODO faire un jekyll serve
+    end
   end
 end
 

data/bin/hyde_admin.yml

@@ -1,8 +1,15 @@
 ---
-default_layout:
-deploy_dest_user: pi
-deploy_dest_address: guerin.rivsc.ovh
-deploy_dest_path: "/home/pi/testblog"
-path_to_jekyll_src: "/Users/scl/blog/rivscblog-zolan"
+default_layout: default
+deploy_dest_user: root
+deploy_dest_address: example.com
+deploy_dest_path: "/absolute/remote/path/mysite"
 rsync_fullpath: rsync
 site_index: index.html
+hyde_admin_language: en
+hyde_admin_auth: false
+hyde_admin_user: admin
+hyde_admin_password: admin
+default_format: html
+display_layout: true
+display_format: true
+images_path: assets/images/

data/bin/hyde_assets/hyde_admin.css

@@ -0,0 +1,18 @@
+/* modal pictures */
+.modal-body-image{
+    display: grid;
+    grid-template-columns: 1fr 1fr 1fr;
+}
+.modal-body-image .image-element{
+    width: 150px;
+    height: 150px;
+}
+.modal-body-image .image-element img{
+    width: 100%;
+    height: 100%;
+    object-fit: contain;
+    overflow: hidden;
+}
+.modal-body-image .image-element img:hover{
+    border:2px solid gray;
+}

data/bin/hyde_assets/hyde_admin.js

@@ -0,0 +1,24 @@
+$(function(){
+    $(document).on('click','#btn-deploy,#btn-rebuild',function(elt){
+        let path = '';
+
+        if(elt.id === 'btn-deploy'){
+            path = '/deploy';
+        }else if(elt.id === 'btn-rebuild'){
+            path = '/rebuild';
+        }
+
+        $.post( path, {
+            beforeSend: function( xhr ) {
+                $('#waiting').show();
+            }
+        })
+            .done(function( data ) {
+                $('#waiting').hide();
+                return false;
+            });
+    });
+    $(document).on('click','.form-confirm',function(){
+        return window.confirm($(this).attr('data-confirm'));
+    });
+});

data/bin/i18n/en.yml

@@ -5,11 +5,17 @@ pages: pages
 post: post
 posts: posts
 save: save
+new: new
 edit: edit
 delete: delete
-are_you_sure: are you sure
+create: create
+upload: upload
+header: header
+add_header: add header
+are_you_sure: are you sure ?
 tag: tag
 tags: tags
+help_tags: set tags separate by comma
 layout: layout
 configuration: configuration
 files: files
@@ -25,3 +31,58 @@ date: date
 content: content
 publish: publish
 path: path
+help_path: You can move the file by changing the path. Change the path can affect SEO or causing 404 errors. For a new file, this is automatically filled at submit.
+overview: overview
+submit: submit
+default_layout: default layout
+help_default_layout: default layout for jekyll posts/pages
+deploy_dest_user: deploy remote user
+help_deploy_dest_user: Ssh user for rsync
+deploy_dest_address: deploy remote domain
+help_deploy_dest_address: remote domain for ssh deployment
+deploy_dest_path: deploy remote path
+help_deploy_dest_path: remote path on disk for ssh deployment
+rsync_fullpath: rsync path
+help_rsync_fullpath: if rsync is not in PATH, othervise just let 'rsync'
+site_index: index file name of site
+help_site_index: link to open when we click on overview
+hyde_admin_language: hyde admin language
+help_hyde_admin_language: To change hyde admin language interface
+set_date_today: set date at today
+change_date_path: update date in path
+change_title_path: update title in path
+directory_input_placeholder: directory name to create
+file_input_placeholder: file name to create
+hyde_admin_auth: enable BasicAuth
+help_hyde_admin_auth: enable BasicAuth
+hyde_admin_user: BasicAuth user
+help_hyde_admin_user: BasicAuth user
+hyde_admin_password: BasicAuth password
+help_hyde_admin_password: BasicAuth password
+default_format: default format
+help_default_format: default format
+display_layout: display the layout input on edit form
+help_display_layout: display the layout input on edit form
+display_format: display the format input on edit form
+help_display_format: display the format input on edit form
+images_path: pictures path
+help_images_path: relative local picture path
+editor_undo: Undo
+editor_redo: Redo
+editor_file: Add picture
+editor_list: List
+editor_list_ol: Numbered List
+editor_link: Add link
+editor_quote: Quote
+editor_title_h1: Title H1
+editor_title_h2: Title H2
+editor_title_h3: Title H3
+editor_title_h4: Title H4
+editor_title_h5: Title H5
+editor_underline: Underline
+editor_bold: Bold
+editor_italic: Italic
+editor_strikethrough: Strikethrough
+default_alt_img: Alt text
+default_title_img: Title text
+parent_dir: dossier parent

data/bin/i18n/fr.yml

@@ -5,11 +5,17 @@ pages: pages
 post: article
 posts: articles
 save: sauvegarder
+new: nouveau
 edit: éditer
 delete: supprimer
-are_you_sure: êtes-vous sûr
+create: créer
+upload: uploader
+header: Entête
+are_you_sure: êtes-vous sûr ?
+add_header: ajouter un entête
 tag: mot-clé
 tags: mots-clés
+help_tags: Mettez les tags séparés par des virgules
 layout: présentation
 configuration: configuration
 files: fichiers
@@ -25,3 +31,58 @@ date: date
 content: contenu
 publish: publier
 path: chemin
+help_path: Vous pouvez déplacer le fichier en changeant le chemin. Changer le chemin peut affecter le SEO et provoquer des erreurs 404. Pour un nouveau fichier, c'est automatiquement remplit à la sousmission du formulaire.
+overview: aperçu
+submit: valider
+default_layout: présentation par défaut
+help_default_layout: présentation par défaut pour les posts et pages
+deploy_dest_user: Utilisateur pour déploiement
+help_deploy_dest_user: Utilisateur pour déploiement par ssh
+deploy_dest_address: Adresse pour déploiement
+help_deploy_dest_address: Domaine ou adresse IP pour déploiement à travers ssh
+deploy_dest_path: chemin distant pour déploiement
+help_deploy_dest_path: chemin distant pour déploiement du site
+rsync_fullpath: chemin rsync
+help_rsync_fullpath: si rsync n'est pas dans le PATH, sinon laissez 'rsync'
+site_index: nom du fichier index pour le site
+help_site_index: Lien pour le lien aperçu, pensez à l'extention si nécessaire
+hyde_admin_language: hyde admin langue
+help_hyde_admin_language: Pour changer la langue d'interface de hyde admin
+set_date_today: mets la date du jour
+change_date_path: mets à jour la date dans le chemin de fichier
+change_title_path: mets à jour le titre dans le chemin de fichier
+directory_input_placeholder: nom du dossier à créer
+file_input_placeholder: nom du fichier à créer
+hyde_admin_auth: enable BasicAuth
+help_hyde_admin_auth: enable BasicAuth
+hyde_admin_user: BasicAuth user
+help_hyde_admin_user: BasicAuth user
+hyde_admin_password: BasicAuth password
+help_hyde_admin_password: BasicAuth password
+default_format: format par défaut
+help_default_format: format par défaut pour les posts
+display_layout: affiche le choix du layout sur le formulaire d'édition
+help_display_layout: affiche le choix du layout sur le formulaire d'édition
+display_format: affiche le choix du format sur le formulaire d'édition
+help_display_format: affiche le choix du format sur le formulaire d'édition
+images_path: chemin des images
+help_images_path: chemin local relatif des images
+editor_undo: Annuler
+editor_redo: Refaire
+editor_file: Ajouter image
+editor_list: Liste
+editor_list_ol: Liste numéroté
+editor_link: Ajouter lien
+editor_quote: Citation
+editor_title_h1: Titre H1
+editor_title_h2: Titre H2
+editor_title_h3: Titre H3
+editor_title_h4: Titre H4
+editor_title_h5: Titre H5
+editor_underline: Souligner
+editor_bold: Gras
+editor_italic: Italique
+editor_strikethrough: Barré
+default_alt_img: Texte alternatif
+default_title_img: Titre image
+parent_dir: dossier parent