update img-slider

This commit is contained in:
2025-07-01 06:01:51 +09:00
parent cf93721bad
commit bc99eb0814
11 changed files with 487 additions and 2 deletions

View File

@ -1185,3 +1185,158 @@ article.article-content {
} }
} }
/* Image Comparison Slider Styles */
.img-comparison-container {
position: relative;
width: 100%;
max-width: 800px;
margin: 20px auto;
overflow: hidden;
border-radius: 8px;
box-shadow: 0 4px 16px rgba(0, 0, 0, 0.1);
}
.img-comparison-slider {
position: relative;
width: 100%;
height: 400px;
overflow: hidden;
cursor: pointer;
}
.img-before,
.img-after {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
overflow: hidden;
}
.img-before {
z-index: 2;
clip-path: inset(0 50% 0 0);
}
.img-after {
z-index: 1;
}
.img-before img,
.img-after img {
width: 100%;
height: 100%;
object-fit: cover;
user-select: none;
pointer-events: none;
position: absolute;
top: 0;
left: 0;
}
.slider {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background: transparent;
outline: none;
cursor: pointer;
z-index: 4;
opacity: 0;
-webkit-appearance: none;
appearance: none;
}
.slider::-webkit-slider-thumb {
-webkit-appearance: none;
appearance: none;
width: 0;
height: 0;
}
.slider::-moz-range-thumb {
width: 0;
height: 0;
border: none;
background: transparent;
}
.slider-thumb {
position: absolute;
top: 0;
left: 50%;
width: 4px;
height: 100%;
background: #ffffff;
z-index: 3;
pointer-events: none;
box-shadow: 0 0 8px rgba(0, 0, 0, 0.3);
transform: translateX(-50%);
}
.slider-thumb::before {
content: '';
position: absolute;
top: 50%;
left: 50%;
width: 40px;
height: 40px;
background: #ffffff;
border: 2px solid var(--theme-color);
border-radius: 50%;
transform: translate(-50%, -50%);
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.2);
}
.slider-thumb::after {
content: '↔';
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
color: var(--theme-color);
font-size: 16px;
font-weight: bold;
z-index: 1;
}
/* Responsive design */
@media (max-width: 768px) {
.img-comparison-container {
margin: 15px auto;
border-radius: 6px;
}
.img-comparison-slider {
height: 250px;
}
.slider-thumb::before {
width: 32px;
height: 32px;
}
.slider-thumb::after {
font-size: 14px;
}
}
@media (max-width: 480px) {
.img-comparison-slider {
height: 200px;
}
.slider-thumb::before {
width: 28px;
height: 28px;
}
.slider-thumb::after {
font-size: 12px;
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 MiB

View File

@ -0,0 +1,123 @@
/**
* Image Comparison Slider
* UE5-style before/after image comparison component
*/
class ImageComparison {
constructor(container) {
this.container = container;
this.slider = container.querySelector('.slider');
this.beforeImg = container.querySelector('.img-before');
this.afterImg = container.querySelector('.img-after');
this.sliderThumb = container.querySelector('.slider-thumb');
this.isDragging = false;
this.containerRect = null;
this.init();
}
init() {
this.bindEvents();
this.updatePosition(50); // Start at 50%
}
bindEvents() {
// Mouse events
this.slider.addEventListener('input', (e) => {
this.updatePosition(e.target.value);
});
this.slider.addEventListener('mousedown', () => {
this.isDragging = true;
document.body.style.userSelect = 'none';
});
document.addEventListener('mouseup', () => {
if (this.isDragging) {
this.isDragging = false;
document.body.style.userSelect = '';
}
});
// Touch events for mobile
this.slider.addEventListener('touchstart', (e) => {
this.isDragging = true;
e.preventDefault();
});
this.slider.addEventListener('touchmove', (e) => {
if (this.isDragging) {
const touch = e.touches[0];
this.containerRect = this.container.getBoundingClientRect();
const x = touch.clientX - this.containerRect.left;
const percentage = Math.max(0, Math.min(100, (x / this.containerRect.width) * 100));
this.slider.value = percentage;
this.updatePosition(percentage);
e.preventDefault();
}
});
this.slider.addEventListener('touchend', () => {
this.isDragging = false;
});
// Direct click on container
this.container.addEventListener('click', (e) => {
if (e.target === this.container || e.target.classList.contains('img-comparison-slider')) {
this.containerRect = this.container.getBoundingClientRect();
const x = e.clientX - this.containerRect.left;
const percentage = Math.max(0, Math.min(100, (x / this.containerRect.width) * 100));
this.slider.value = percentage;
this.updatePosition(percentage);
}
});
// Keyboard support
this.slider.addEventListener('keydown', (e) => {
let value = parseFloat(this.slider.value);
switch (e.key) {
case 'ArrowLeft':
value = Math.max(0, value - 1);
break;
case 'ArrowRight':
value = Math.min(100, value + 1);
break;
case 'Home':
value = 0;
break;
case 'End':
value = 100;
break;
default:
return;
}
e.preventDefault();
this.slider.value = value;
this.updatePosition(value);
});
}
updatePosition(percentage) {
const position = parseFloat(percentage);
// Update clip-path for before image to show only the left portion
this.beforeImg.style.clipPath = `inset(0 ${100 - position}% 0 0)`;
// Update slider thumb position
this.sliderThumb.style.left = `${position}%`;
this.sliderThumb.style.transform = `translateX(-50%)`;
}
}
// Auto-initialize all image comparison components
document.addEventListener('DOMContentLoaded', function() {
const comparisons = document.querySelectorAll('.img-comparison-container');
comparisons.forEach(container => {
new ImageComparison(container);
});
});
// Export for manual initialization
window.ImageComparison = ImageComparison;

View File

@ -114,6 +114,7 @@
</script> </script>
<script src="/js/ask-ai.js"></script> <script src="/js/ask-ai.js"></script>
<script src="/js/theme.js"></script> <script src="/js/theme.js"></script>
<script src="/js/image-comparison.js"></script>
{% include "oauth-assets.html" %} {% include "oauth-assets.html" %}
</body> </body>

View File

@ -7,6 +7,7 @@ pub mod config;
pub mod doc_generator; pub mod doc_generator;
pub mod generator; pub mod generator;
pub mod markdown; pub mod markdown;
pub mod shortcode;
pub mod mcp; pub mod mcp;
pub mod oauth; pub mod oauth;
// pub mod ollama_proxy; // Temporarily disabled - uses actix-web instead of axum // pub mod ollama_proxy; // Temporarily disabled - uses actix-web instead of axum

View File

@ -7,6 +7,7 @@ mod commands;
mod doc_generator; mod doc_generator;
mod generator; mod generator;
mod markdown; mod markdown;
mod shortcode;
mod template; mod template;
mod oauth; mod oauth;
mod translator; mod translator;

View File

@ -6,12 +6,14 @@ use syntect::html::{styled_line_to_highlighted_html, IncludeBackground};
use gray_matter::Matter; use gray_matter::Matter;
use gray_matter::engine::YAML; use gray_matter::engine::YAML;
use serde_json::Value; use serde_json::Value;
use crate::shortcode::ShortcodeProcessor;
pub struct MarkdownProcessor { pub struct MarkdownProcessor {
highlight_code: bool, highlight_code: bool,
highlight_theme: String, highlight_theme: String,
syntax_set: SyntaxSet, syntax_set: SyntaxSet,
theme_set: ThemeSet, theme_set: ThemeSet,
shortcode_processor: ShortcodeProcessor,
} }
impl MarkdownProcessor { impl MarkdownProcessor {
@ -21,6 +23,7 @@ impl MarkdownProcessor {
highlight_theme: highlight_theme.unwrap_or_else(|| "Monokai".to_string()), highlight_theme: highlight_theme.unwrap_or_else(|| "Monokai".to_string()),
syntax_set: SyntaxSet::load_defaults_newlines(), syntax_set: SyntaxSet::load_defaults_newlines(),
theme_set: ThemeSet::load_defaults(), theme_set: ThemeSet::load_defaults(),
shortcode_processor: ShortcodeProcessor::new(),
} }
} }
@ -68,6 +71,9 @@ impl MarkdownProcessor {
pub fn render(&self, content: &str) -> Result<String> { pub fn render(&self, content: &str) -> Result<String> {
// Process shortcodes first
let processed_content = self.shortcode_processor.process(content);
let mut options = Options::empty(); let mut options = Options::empty();
options.insert(Options::ENABLE_STRIKETHROUGH); options.insert(Options::ENABLE_STRIKETHROUGH);
options.insert(Options::ENABLE_TABLES); options.insert(Options::ENABLE_TABLES);
@ -75,15 +81,21 @@ impl MarkdownProcessor {
options.insert(Options::ENABLE_TASKLISTS); options.insert(Options::ENABLE_TASKLISTS);
if self.highlight_code { if self.highlight_code {
self.render_with_syntax_highlighting(content, options) self.render_with_syntax_highlighting(&processed_content, options)
} else { } else {
let parser = Parser::new_ext(content, options); let parser = Parser::new_ext(&processed_content, options);
let mut html_output = String::new(); let mut html_output = String::new();
html::push_html(&mut html_output, parser); html::push_html(&mut html_output, parser);
Ok(html_output) Ok(html_output)
} }
} }
/// Provide access to the shortcode processor for custom shortcode registration
#[allow(dead_code)]
pub fn shortcode_processor_mut(&mut self) -> &mut ShortcodeProcessor {
&mut self.shortcode_processor
}
fn render_with_syntax_highlighting(&self, content: &str, options: Options) -> Result<String> { fn render_with_syntax_highlighting(&self, content: &str, options: Options) -> Result<String> {
let parser = Parser::new_ext(content, options); let parser = Parser::new_ext(content, options);
let mut html_output = String::new(); let mut html_output = String::new();

192
src/shortcode.rs Normal file
View File

@ -0,0 +1,192 @@
use regex::Regex;
use std::collections::HashMap;
pub struct ShortcodeProcessor {
shortcodes: HashMap<String, Box<dyn Fn(&str) -> String + Send + Sync>>,
}
impl ShortcodeProcessor {
pub fn new() -> Self {
let mut processor = Self {
shortcodes: HashMap::new(),
};
// Register built-in shortcodes
processor.register_img_compare();
processor
}
fn register_img_compare(&mut self) {
self.shortcodes.insert(
"img-compare".to_string(),
Box::new(|attrs| Self::parse_img_compare_shortcode(attrs)),
);
}
pub fn process(&self, content: &str) -> String {
let mut processed = content.to_string();
// Process {{< shortcode >}} format (Hugo-style)
let hugo_regex = Regex::new(r#"\{\{\<\s*(\w+(?:-\w+)*)\s+([^>]*)\s*\>\}\}"#).unwrap();
processed = hugo_regex.replace_all(&processed, |caps: &regex::Captures| {
let shortcode_name = &caps[1];
let attrs = &caps[2];
if let Some(handler) = self.shortcodes.get(shortcode_name) {
handler(attrs)
} else {
caps[0].to_string() // Return original if shortcode not found
}
}).to_string();
// Process [shortcode] format (Bracket-style)
let bracket_regex = Regex::new(r#"\[(\w+(?:-\w+)*)\s+([^\]]*)\]"#).unwrap();
processed = bracket_regex.replace_all(&processed, |caps: &regex::Captures| {
let shortcode_name = &caps[1];
let attrs = &caps[2];
if let Some(handler) = self.shortcodes.get(shortcode_name) {
handler(attrs)
} else {
caps[0].to_string() // Return original if shortcode not found
}
}).to_string();
processed
}
fn parse_attributes(attrs: &str) -> HashMap<String, String> {
let attr_regex = Regex::new(r#"(\w+(?:-\w+)*)=(?:"([^"]*)"|'([^']*)'|([^\s]+))"#).unwrap();
let mut attributes = HashMap::new();
for caps in attr_regex.captures_iter(attrs) {
let key = caps.get(1).unwrap().as_str().to_string();
let value = caps.get(2).or(caps.get(3)).or(caps.get(4)).unwrap().as_str().to_string();
attributes.insert(key, value);
}
attributes
}
fn parse_img_compare_shortcode(attrs: &str) -> String {
let attributes = Self::parse_attributes(attrs);
let before = attributes.get("before").map(|s| s.as_str()).unwrap_or("");
let after = attributes.get("after").map(|s| s.as_str()).unwrap_or("");
let before_caption = attributes.get("before-caption")
.or(attributes.get("before-alt"))
.map(|s| s.as_str())
.unwrap_or("Before");
let after_caption = attributes.get("after-caption")
.or(attributes.get("after-alt"))
.map(|s| s.as_str())
.unwrap_or("After");
let width = attributes.get("width").map(|s| s.as_str()).unwrap_or("1000");
let height = attributes.get("height").map(|s| s.as_str()).unwrap_or("400");
let alt = attributes.get("alt").map(|s| s.as_str()).unwrap_or("");
let alt_suffix = if !alt.is_empty() {
format!(" | {}", alt)
} else {
String::new()
};
format!(r#"
<div class="img-comparison-container">
<div class="img-comparison-slider" style="height: {}px;">
<div class="img-before overlay-side">
<img src="{}" alt="{}{}" loading="lazy" width="{}">
</div>
<div class="img-after">
<img src="{}" alt="{}{}" loading="lazy" width="{}">
</div>
<input type="range" min="0" max="100" value="50" class="slider">
<div class="slider-thumb">
<div class="slider-thumb-img"></div>
</div>
</div>
</div>"#,
height,
before, before_caption, alt_suffix, width,
after, after_caption, alt_suffix, width
)
}
/// Register a custom shortcode handler
#[allow(dead_code)]
pub fn register_shortcode<F>(&mut self, name: &str, handler: F)
where
F: Fn(&str) -> String + Send + Sync + 'static,
{
self.shortcodes.insert(name.to_string(), Box::new(handler));
}
/// Get list of registered shortcodes
#[allow(dead_code)]
pub fn get_shortcode_names(&self) -> Vec<&String> {
self.shortcodes.keys().collect()
}
}
impl Default for ShortcodeProcessor {
fn default() -> Self {
Self::new()
}
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn test_img_compare_hugo_style() {
let processor = ShortcodeProcessor::new();
let input = r#"{{< img-compare before="/before.jpg" after="/after.jpg" >}}"#;
let result = processor.process(input);
assert!(result.contains("img-comparison-container"));
assert!(result.contains("/before.jpg"));
assert!(result.contains("/after.jpg"));
}
#[test]
fn test_img_compare_bracket_style() {
let processor = ShortcodeProcessor::new();
let input = r#"[img-compare before="/before.jpg" after="/after.jpg"]"#;
let result = processor.process(input);
assert!(result.contains("img-comparison-container"));
assert!(result.contains("/before.jpg"));
assert!(result.contains("/after.jpg"));
}
#[test]
fn test_custom_shortcode() {
let mut processor = ShortcodeProcessor::new();
processor.register_shortcode("test", |_| "<div>test</div>".to_string());
let input = "{{< test >}}";
let result = processor.process(input);
assert_eq!(result, "<div>test</div>");
}
#[test]
fn test_unknown_shortcode() {
let processor = ShortcodeProcessor::new();
let input = "{{< unknown attr=\"value\" >}}";
let result = processor.process(input);
assert_eq!(result, input); // Should return original
}
#[test]
fn test_attribute_parsing() {
let attributes = ShortcodeProcessor::parse_attributes(r#"before="/test.jpg" after='test2.jpg' width=800"#);
assert_eq!(attributes.get("before").unwrap(), "/test.jpg");
assert_eq!(attributes.get("after").unwrap(), "test2.jpg");
assert_eq!(attributes.get("width").unwrap(), "800");
}
}