hyde_admin 0.0.10 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c2a24943a838bb470b6375c0658626798f0f1beb456f65d792995a4fe7bf0bd
-  data.tar.gz: a367a451d9b2e2aa05aa79cc2812702624472e59a776bf9fdc842260fa1cf099
+  metadata.gz: 7dc5c1f3c3e06393c4c25ce2a7463e035c156e071a5263c9207b8a05df3d5b9b
+  data.tar.gz: bf460efdb34250deebffd318269cf82dd9cc61a1bd92812131dd9d8033f1e302
 SHA512:
-  metadata.gz: 712d1960647c69074f878d94d4bc1db2193f3f170835f7c7ad98d4652df95ad96ef25d9d6dd238d19517ff0a87d5256a2875dafba89b534d69a8d632de576596
-  data.tar.gz: f3773cbc9b770c60ee5c237f1ac657d4ed9cbe25973f8a3cfffbf86938ac6b9ab8573820a3e72710dcf32e96738d3d4c0e7954c7efde347ad122a79a4bff3a6b
+  metadata.gz: ec1cb2e4a56c723f3930999c68976a460dc0ed70e12417b5a9ee51c319f48246d2ab6de6801ccee9f3682aa17a0ec44ad8c2614d62d2806f70c3853afcbce19f
+  data.tar.gz: 7ad9661636366333ca352891047b189c851876c4dc4166c6cf7fe8319c5bf3fbbbb0b651ee413b8dd2aaab24c288933db0e09386d21180b7209f84030940fe9e

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# 0.0.12
+
+Add liquid code highlighter in wysiwyg editor
+Add new option to maximize text editor
+
+# 0.0.11
+
+Add logo hyde admin
+Increase image window size
+Add dependency to avoid to set them in jekyll site gemfile
+
 # 0.0.9
 
 Hide deploy button if 'deploy_dest_address' is empty.

data/README.md

@@ -2,13 +2,24 @@
 
 Hyde_admin is a administration frontend for Jekyll (static site generator in Ruby).
 
+![Hyde_admin for jekyll](hyde_admin_for_jekyll.png)
+
 ## Getting Started with Hyde Admin
 
+# Prerequisite
+
+Install ImageMagick (required by mini_magick)
+
+```
+apt install imagemagick
+```
+
+# Install
+
 Add
 
 ```
 gem 'hyde_admin'
-gem 'puma'
 ```
 
 In the Gemfile of your jekyll site.
@@ -17,17 +28,19 @@ Run
 
 `bundle update`
 
-When run 
+# Run hyde_admin
+
+Run 
 
 `hyde_admin`
 
 in your jekyll directory.
-You can visit localhost:9292 !
+You can visit http://localhost:9292/ !
 
 hyde_admin.yml is automatically generated in your jekyll directory.
-(you can change settings with hyde_admin ou directly)
+(you can change settings with hyde_admin at http://localhost:9292/configuration or directly with text editor)
 
-Hyde_admin allow ssh deployment.
+Hyde_admin allow ssh deployment with rsync.
 
 ## New version of hyde_admin ?
 

data/bin/admin_views/admin_layout.html.erb

@@ -31,6 +31,7 @@
       <div class="row">
         <nav id="sidebarMenu" class="col-md-3 col-lg-2 d-md-block bg-light sidebar collapse">
           <div class="position-sticky pt-3">
+            <a href="/"><img src="/img/logo.png" alt="Hyde Admin" title="Logo hyde admin" class="sidebarMenu-logo" /></a>
             <ul class="nav flex-column">
               <li class="nav-item">
               </li>
@@ -97,21 +98,6 @@
           </div>
         </nav>
         <main class="col-md-9 ms-sm-auto col-lg-10 px-md-4">
-          <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
-            <h1 class="h2">Hyde Admin for Jekyll</h1>
-            <!--
-            <div class="btn-toolbar mb-2 mb-md-0">
-              <div class="btn-group me-2">
-                <button type="button" class="btn btn-sm btn-outline-secondary"><%= t.backup_zip %></button>
-                <button type="button" class="btn btn-sm btn-outline-secondary">Export</button>
-              </div>
-              <button type="button" class="btn btn-sm btn-outline-secondary dropdown-toggle">
-                <span data-feather="calendar"></span>
-                This week
-              </button>
-            </div>
-            -->
-          </div>
           <%= yield %>
         </main>
       </div>
@@ -180,6 +166,7 @@
             lineNumbers: true,
             tabSize: 2,
             indentWithTabs: false,
+            viewportMargin: Infinity,
             mode: "<%= {'.js' => 'javascript', '.json' => 'javascript', '.xml' => 'xml', '.svg' => 'xml', '.css' => 'css', '.yml' => 'yaml', '.sass' => 'sass', '.rb' => 'ruby', '.md' => 'markdown'}[File.extname(@file)] || 'markdown' %>"
         });
       }

data/bin/admin_views/editor_html.erb

@@ -21,4 +21,15 @@
     <button type="button" class="btn btn-light"><i class="fas fa-italic cmt-replace" title="<%= EscapeUtils.escape_html t.editor_italic %>"></i></button>
     <button type="button" class="btn btn-light"><i class="fas fa-strikethrough cmt-replace" title="<%= EscapeUtils.escape_html t.editor_strikethrough %>"></i></button>
   </div>
-</div>
+  <div class="btn-group mr-2" role="group" aria-label="Liquid tags">
+    <button type="button" class="btn btn-light"><i class="fas fa-code cmt-replace" title="<%= EscapeUtils.escape_html t.editor_liquid_code %>"></i></button>
+    <button type="button" class="btn btn-light"><i class="fas fa-terminal cmt-replace" title="<%= EscapeUtils.escape_html t.editor_pre_code %>"></i></button>
+  </div>
+</div>
+<% if @hyde_parameters['text_editor_maximized'].to_s == 'true' %>
+  <style>
+    .CodeMirror{
+      height: auto;
+    }
+  </style>
+<% end %>

data/bin/admin_views/editor_js.erb

@@ -101,11 +101,21 @@ $(document).on('click', '.codemirror-toolbar .cmt-replace', function(){
       end_str = '';
     }
   }else if($(this).hasClass('fa-list-ol')){
-  begin_str = '<ol>\n  <li>';
-    end_str = '</li>\n</ol>';
+    begin_str = '<ol>\n  <li>';
+      end_str = '</li>\n</ol>';
+      if(window.mode_markdown){
+        begin_str = '1. ';
+        end_str = '';
+      }
+  }else if($(this).hasClass('fa-code')){
+    begin_str = '{% highlight ruby linenos %}\n';
+    end_str = '{% endhighlight %}\n';
+  }else if($(this).hasClass('fa-terminal')){
+    begin_str = '<pre>\n';
+    end_str = '\n</pre>';
     if(window.mode_markdown){
-      begin_str = '1. ';
-      end_str = '';
+      begin_str = '```';
+      end_str = '```';
     }
   }
 

data/bin/hyde_admin

@@ -1,3 +1,3 @@
 #!/bin/env ruby
 
-`rackup "#{File.expand_path(File.dirname(__FILE__))}/hyde_admin.ru"`
+`rackup -o 0.0.0.0 -p 9292 "#{File.expand_path(File.dirname(__FILE__))}/hyde_admin.ru"`

data/bin/hyde_admin.ru

@@ -25,7 +25,7 @@ class Mid < Roda
   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 :static, ['/mode', '/lib', '/fslightbox', '/hyde_assets', '/img'], :root => File.join(File.expand_path(File.dirname(__FILE__)))
   plugin :http_auth
   plugin :common_logger
 
@@ -38,6 +38,7 @@ class Mid < Roda
       FileUtils.cp(yml_in_gem, yml_in_current_dir)
     end
     @hyde_parameters ||= YAML.load(File.read(yml_in_current_dir))
+
     super(param)
   end
 
@@ -132,8 +133,8 @@ class Mid < Roda
 
     # Rebuild static files
     r.on "rebuild" do
-      puts Dir.pwd
-      `cd #{Dir.pwd} && jekyll b`
+      $stderr.puts Dir.pwd
+      $stderr.puts `cd #{Dir.pwd} && jekyll b`
       r.redirect "/dashboard"
     end
 
@@ -411,7 +412,8 @@ end
 class App < Roda
   use Mid
   use Rack::Static, :urls => [''], root: Dir.pwd # allow to match all files in Dir.pwd
-end
 
-run App.freeze.app
+  $stderr.puts "===> Starting hyde_admin : open http://127.0.0.1:9292/"
+end
 
+run App.freeze.app

data/bin/hyde_admin.yml

@@ -15,4 +15,5 @@ display_format: 'true'
 images_path: assets/images/
 resize_format: jpg
 resize_size: 1500x1000
-resize_enable: 'true'
+resize_enable: 'true'
+text_editor_maximized: 'true'

data/bin/hyde_assets/hyde_admin.css

@@ -20,18 +20,38 @@
 
 .image-element{
     position: relative;
+    margin-left: auto;
+    margin-right: auto;
+    margin-bottom: 20px;
 }
 
 .image-element span{
-    position: absolute;
     bottom:0px;
-    left:5px;
     z-index: 10;
     font-weight: bold;
     margin-bottom: -20px;
+
+    text-shadow: 0px 0px 3px white;
+    margin-left: -100%;
+    margin-right: -100%;
+    text-align: center;
+    display: block;
+}
+.modal-dialog {
+    max-width: 90vw;
 }
 
 .CodeMirror{
     border: 1px solid #ced4da;
     border-radius: 4px;
-}
+}
+
+/* hyde admin style */
+.sidebarMenu-logo{
+    width: 144px;
+    margin-left: auto;
+    margin-right: auto;
+    display: block;
+    margin-bottom: 30px;
+    margin-top: 10px;
+}

data/bin/i18n/en.yml

@@ -83,6 +83,8 @@ editor_underline: Underline
 editor_bold: Bold
 editor_italic: Italic
 editor_strikethrough: Strikethrough
+editor_pre_code: Code
+editor_liquid_code: Liquid code
 default_alt_img: Alt text
 default_title_img: Title text
 parent_dir: parent directory
@@ -106,4 +108,6 @@ help_resize_format: jpg or png
 resize_size: "size to fit, example : 1500x1000"
 help_resize_size: Downsize to fit to the specified size (resize preserve ratio), example 1500x1000
 resize_enable: Enable resizing for images
-help_resize_enable: enable feature resize image at upload
+help_resize_enable: enable feature resize image at upload
+text_editor_maximized: enable maximised editor
+help_text_editor_maximized: permet d'agrandir l'éditeur au maximum du contenu

data/bin/i18n/fr.yml

@@ -83,6 +83,8 @@ editor_underline: Souligner
 editor_bold: Gras
 editor_italic: Italique
 editor_strikethrough: Barré
+editor_pre_code: Code
+editor_liquid_code: Liquid code
 default_alt_img: Texte alternatif
 default_title_img: Titre image
 parent_dir: dossier parent
@@ -106,4 +108,6 @@ help_resize_format: jpg ou png
 resize_size: "Recadrer en (example : 1500x1000)"
 help_resize_size: Réduit les image pour coller à la taille spécifiée (le redimensionnement préserve le ratio), exemple 1500x1000
 resize_enable: activer redimensionnement
-help_resize_enable: active la fonctionnalité de redimensionnement d'image à l'upload
+help_resize_enable: active la fonctionnalité de redimensionnement d'image à l'upload
+text_editor_maximized: activer l'editeur maximisé
+help_text_editor_maximized: permet d'agrandir l'éditeur au maximum du contenu

data/hyde_admin.gemspec

@@ -32,4 +32,7 @@ Gem::Specification.new do |s|
   #s.add_runtime_dependency("i18n", "~> 0.4.0") # I18n.transliterate (already required by jekyll)
   s.add_runtime_dependency('jekyll') # Because we call jekyll binary
   s.add_runtime_dependency('image_processing') # JPEG quality
+  s.add_runtime_dependency('mini_magick')
+  s.add_runtime_dependency('rack', '2.2.4')
+  s.add_runtime_dependency('puma')
 end

data/lib/hyde_admin/version.rb

@@ -1,3 +1,3 @@
 module HydeAdmin
-  VERSION = "0.0.10"
+  VERSION = "0.0.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hyde_admin
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.13
 platform: ruby
 authors:
 - Sylvain Claudel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-27 00:00:00.000000000 Z
+date: 2024-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roda
@@ -94,6 +94,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mini_magick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.2.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.2.4
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Jekyll admin interface
 email: claudel.sylvain@gmail.com
 executables:
@@ -133,6 +175,7 @@ files:
 - bin/hyde_assets/hyde_admin.js
 - bin/i18n/en.yml
 - bin/i18n/fr.yml
+- bin/img/logo.png
 - bin/lib/codemirror.css
 - bin/lib/codemirror.js
 - bin/mode/css/css.js
@@ -172,6 +215,7 @@ files:
 - bin/mode/yaml/index.html
 - bin/mode/yaml/yaml.js
 - hyde_admin.gemspec
+- hyde_admin_for_jekyll.png
 - lib/hyde_admin/version.rb
 homepage: https://rubygems.org/gems/hyde_admin
 licenses:
@@ -196,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Hyde for Jekyll site