style: Improve markdown editor styling and functionality
- Update dark mode button icon and styling - Add styling for new collection button - Apply default iframe styles in preview pane - Adjust vertical divider height in header buttons - Improve handling of JSX-like attributes in markdown - Add support for new collection functionality - Refine file loading logic in view mode - Improve dark mode toggle icon and integration - Update UI for edit/view mode toggle button
This commit is contained in:
@@ -24,7 +24,7 @@
|
||||
function enableDarkMode() {
|
||||
isDarkMode = true;
|
||||
document.body.classList.add('dark-mode');
|
||||
document.getElementById('darkModeIcon').textContent = '☀️';
|
||||
document.getElementById('darkModeIcon').innerHTML = '<i class="bi bi-sun-fill"></i>';
|
||||
localStorage.setItem('darkMode', 'true');
|
||||
|
||||
mermaid.initialize({
|
||||
@@ -41,7 +41,7 @@
|
||||
function disableDarkMode() {
|
||||
isDarkMode = false;
|
||||
document.body.classList.remove('dark-mode');
|
||||
document.getElementById('darkModeIcon').textContent = '🌙';
|
||||
// document.getElementById('darkModeIcon').textContent = '🌙';
|
||||
localStorage.setItem('darkMode', 'false');
|
||||
|
||||
mermaid.initialize({
|
||||
|
||||
138
static/app.js
138
static/app.js
@@ -1,5 +1,5 @@
|
||||
// Markdown Editor Application
|
||||
(function() {
|
||||
(function () {
|
||||
'use strict';
|
||||
|
||||
// State management
|
||||
@@ -21,16 +21,16 @@
|
||||
function enableDarkMode() {
|
||||
isDarkMode = true;
|
||||
document.body.classList.add('dark-mode');
|
||||
document.getElementById('darkModeIcon').textContent = '☀️';
|
||||
document.getElementById('darkModeIcon').innerHTML = '<i class="bi bi-sun-fill"></i>';
|
||||
localStorage.setItem('darkMode', 'true');
|
||||
|
||||
|
||||
// Update mermaid theme
|
||||
mermaid.initialize({
|
||||
mermaid.initialize({
|
||||
startOnLoad: false,
|
||||
theme: 'dark',
|
||||
securityLevel: 'loose'
|
||||
});
|
||||
|
||||
|
||||
// Re-render preview if there's content
|
||||
if (editor && editor.getValue()) {
|
||||
updatePreview();
|
||||
@@ -40,16 +40,16 @@
|
||||
function disableDarkMode() {
|
||||
isDarkMode = false;
|
||||
document.body.classList.remove('dark-mode');
|
||||
document.getElementById('darkModeIcon').textContent = '🌙';
|
||||
// document.getElementById('darkModeIcon').textContent = '🌙';
|
||||
localStorage.setItem('darkMode', 'false');
|
||||
|
||||
|
||||
// Update mermaid theme
|
||||
mermaid.initialize({
|
||||
mermaid.initialize({
|
||||
startOnLoad: false,
|
||||
theme: 'default',
|
||||
securityLevel: 'loose'
|
||||
});
|
||||
|
||||
|
||||
// Re-render preview if there's content
|
||||
if (editor && editor.getValue()) {
|
||||
updatePreview();
|
||||
@@ -65,7 +65,7 @@
|
||||
}
|
||||
|
||||
// Initialize Mermaid
|
||||
mermaid.initialize({
|
||||
mermaid.initialize({
|
||||
startOnLoad: false,
|
||||
theme: 'default',
|
||||
securityLevel: 'loose'
|
||||
@@ -87,15 +87,15 @@
|
||||
async function uploadImage(file) {
|
||||
const formData = new FormData();
|
||||
formData.append('file', file);
|
||||
|
||||
|
||||
try {
|
||||
const response = await fetch('/api/upload-image', {
|
||||
method: 'POST',
|
||||
body: formData
|
||||
});
|
||||
|
||||
|
||||
if (!response.ok) throw new Error('Upload failed');
|
||||
|
||||
|
||||
const result = await response.json();
|
||||
return result.url;
|
||||
} catch (error) {
|
||||
@@ -108,48 +108,48 @@
|
||||
// Handle drag and drop
|
||||
function setupDragAndDrop() {
|
||||
const editorElement = document.querySelector('.CodeMirror');
|
||||
|
||||
|
||||
// Prevent default drag behavior
|
||||
['dragenter', 'dragover', 'dragleave', 'drop'].forEach(eventName => {
|
||||
editorElement.addEventListener(eventName, preventDefaults, false);
|
||||
});
|
||||
|
||||
|
||||
function preventDefaults(e) {
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
}
|
||||
|
||||
|
||||
// Highlight drop zone
|
||||
['dragenter', 'dragover'].forEach(eventName => {
|
||||
editorElement.addEventListener(eventName, () => {
|
||||
editorElement.classList.add('drag-over');
|
||||
}, false);
|
||||
});
|
||||
|
||||
|
||||
['dragleave', 'drop'].forEach(eventName => {
|
||||
editorElement.addEventListener(eventName, () => {
|
||||
editorElement.classList.remove('drag-over');
|
||||
}, false);
|
||||
});
|
||||
|
||||
|
||||
// Handle drop
|
||||
editorElement.addEventListener('drop', async (e) => {
|
||||
const files = e.dataTransfer.files;
|
||||
|
||||
|
||||
if (files.length === 0) return;
|
||||
|
||||
|
||||
// Filter for images only
|
||||
const imageFiles = Array.from(files).filter(file =>
|
||||
const imageFiles = Array.from(files).filter(file =>
|
||||
file.type.startsWith('image/')
|
||||
);
|
||||
|
||||
|
||||
if (imageFiles.length === 0) {
|
||||
showNotification('Please drop image files only', 'warning');
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
showNotification(`Uploading ${imageFiles.length} image(s)...`, 'info');
|
||||
|
||||
|
||||
// Upload images
|
||||
for (const file of imageFiles) {
|
||||
const url = await uploadImage(file);
|
||||
@@ -163,12 +163,12 @@
|
||||
}
|
||||
}
|
||||
}, false);
|
||||
|
||||
|
||||
// Also handle paste events for images
|
||||
editorElement.addEventListener('paste', async (e) => {
|
||||
const items = e.clipboardData?.items;
|
||||
if (!items) return;
|
||||
|
||||
|
||||
for (const item of items) {
|
||||
if (item.type.startsWith('image/')) {
|
||||
e.preventDefault();
|
||||
@@ -198,17 +198,17 @@
|
||||
lineWrapping: true,
|
||||
autofocus: true,
|
||||
extraKeys: {
|
||||
'Ctrl-S': function() { saveFile(); },
|
||||
'Cmd-S': function() { saveFile(); }
|
||||
'Ctrl-S': function () { saveFile(); },
|
||||
'Cmd-S': function () { saveFile(); }
|
||||
}
|
||||
});
|
||||
|
||||
// Update preview on change
|
||||
editor.on('change', debounce(updatePreview, 300));
|
||||
|
||||
|
||||
// Setup drag and drop after editor is ready
|
||||
setTimeout(setupDragAndDrop, 100);
|
||||
|
||||
|
||||
// Sync scroll
|
||||
editor.on('scroll', handleEditorScroll);
|
||||
}
|
||||
@@ -230,7 +230,7 @@
|
||||
async function updatePreview() {
|
||||
const content = editor.getValue();
|
||||
const previewDiv = document.getElementById('preview');
|
||||
|
||||
|
||||
if (!content.trim()) {
|
||||
previewDiv.innerHTML = `
|
||||
<div class="text-muted text-center mt-5">
|
||||
@@ -244,15 +244,15 @@
|
||||
try {
|
||||
// Parse markdown to HTML
|
||||
let html = marked.parse(content);
|
||||
|
||||
|
||||
// Replace mermaid code blocks with div containers
|
||||
html = html.replace(
|
||||
/<pre><code class="language-mermaid">([\s\S]*?)<\/code><\/pre>/g,
|
||||
'<div class="mermaid">$1</div>'
|
||||
);
|
||||
|
||||
|
||||
previewDiv.innerHTML = html;
|
||||
|
||||
|
||||
// Apply syntax highlighting to code blocks
|
||||
const codeBlocks = previewDiv.querySelectorAll('pre code');
|
||||
codeBlocks.forEach(block => {
|
||||
@@ -262,7 +262,7 @@
|
||||
Prism.highlightElement(block);
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
// Render mermaid diagrams
|
||||
const mermaidElements = previewDiv.querySelectorAll('.mermaid');
|
||||
if (mermaidElements.length > 0) {
|
||||
@@ -288,15 +288,15 @@
|
||||
// Handle editor scroll for synchronized scrolling
|
||||
function handleEditorScroll() {
|
||||
if (!isScrollingSynced) return;
|
||||
|
||||
|
||||
clearTimeout(scrollTimeout);
|
||||
scrollTimeout = setTimeout(() => {
|
||||
const editorScrollInfo = editor.getScrollInfo();
|
||||
const editorScrollPercentage = editorScrollInfo.top / (editorScrollInfo.height - editorScrollInfo.clientHeight);
|
||||
|
||||
|
||||
const previewPane = document.querySelector('.preview-pane');
|
||||
const previewScrollHeight = previewPane.scrollHeight - previewPane.clientHeight;
|
||||
|
||||
|
||||
if (previewScrollHeight > 0) {
|
||||
previewPane.scrollTop = editorScrollPercentage * previewScrollHeight;
|
||||
}
|
||||
@@ -308,22 +308,22 @@
|
||||
try {
|
||||
const response = await fetch('/api/files');
|
||||
if (!response.ok) throw new Error('Failed to load file list');
|
||||
|
||||
|
||||
const files = await response.json();
|
||||
const fileListDiv = document.getElementById('fileList');
|
||||
|
||||
|
||||
if (files.length === 0) {
|
||||
fileListDiv.innerHTML = '<div class="text-muted p-2 small">No files yet</div>';
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
fileListDiv.innerHTML = files.map(file => `
|
||||
<a href="#" class="list-group-item list-group-item-action file-item" data-filename="${file.filename}">
|
||||
<span class="file-name">${file.filename}</span>
|
||||
<span class="file-size">${formatFileSize(file.size)}</span>
|
||||
</a>
|
||||
`).join('');
|
||||
|
||||
|
||||
// Add click handlers
|
||||
document.querySelectorAll('.file-item').forEach(item => {
|
||||
item.addEventListener('click', (e) => {
|
||||
@@ -343,19 +343,19 @@
|
||||
try {
|
||||
const response = await fetch(`/api/files/${filename}`);
|
||||
if (!response.ok) throw new Error('Failed to load file');
|
||||
|
||||
|
||||
const data = await response.json();
|
||||
currentFile = data.filename;
|
||||
|
||||
|
||||
// Update UI
|
||||
document.getElementById('filenameInput').value = data.filename;
|
||||
editor.setValue(data.content);
|
||||
|
||||
|
||||
// Update active state in file list
|
||||
document.querySelectorAll('.file-item').forEach(item => {
|
||||
item.classList.toggle('active', item.dataset.filename === filename);
|
||||
});
|
||||
|
||||
|
||||
updatePreview();
|
||||
showNotification(`Loaded ${filename}`, 'success');
|
||||
} catch (error) {
|
||||
@@ -367,14 +367,14 @@
|
||||
// Save current file
|
||||
async function saveFile() {
|
||||
const filename = document.getElementById('filenameInput').value.trim();
|
||||
|
||||
|
||||
if (!filename) {
|
||||
showNotification('Please enter a filename', 'warning');
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
const content = editor.getValue();
|
||||
|
||||
|
||||
try {
|
||||
const response = await fetch('/api/files', {
|
||||
method: 'POST',
|
||||
@@ -383,12 +383,12 @@
|
||||
},
|
||||
body: JSON.stringify({ filename, content })
|
||||
});
|
||||
|
||||
|
||||
if (!response.ok) throw new Error('Failed to save file');
|
||||
|
||||
|
||||
const result = await response.json();
|
||||
currentFile = result.filename;
|
||||
|
||||
|
||||
showNotification(`Saved ${result.filename}`, 'success');
|
||||
loadFileList();
|
||||
} catch (error) {
|
||||
@@ -400,31 +400,31 @@
|
||||
// Delete current file
|
||||
async function deleteFile() {
|
||||
const filename = document.getElementById('filenameInput').value.trim();
|
||||
|
||||
|
||||
if (!filename) {
|
||||
showNotification('No file selected', 'warning');
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
if (!confirm(`Are you sure you want to delete ${filename}?`)) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
try {
|
||||
const response = await fetch(`/api/files/${filename}`, {
|
||||
method: 'DELETE'
|
||||
});
|
||||
|
||||
|
||||
if (!response.ok) throw new Error('Failed to delete file');
|
||||
|
||||
|
||||
showNotification(`Deleted ${filename}`, 'success');
|
||||
|
||||
|
||||
// Clear editor
|
||||
currentFile = null;
|
||||
document.getElementById('filenameInput').value = '';
|
||||
editor.setValue('');
|
||||
updatePreview();
|
||||
|
||||
|
||||
loadFileList();
|
||||
} catch (error) {
|
||||
console.error('Error deleting file:', error);
|
||||
@@ -438,12 +438,12 @@
|
||||
document.getElementById('filenameInput').value = '';
|
||||
editor.setValue('');
|
||||
updatePreview();
|
||||
|
||||
|
||||
// Remove active state from all file items
|
||||
document.querySelectorAll('.file-item').forEach(item => {
|
||||
item.classList.remove('active');
|
||||
});
|
||||
|
||||
|
||||
showNotification('New file created', 'info');
|
||||
}
|
||||
|
||||
@@ -460,25 +460,25 @@
|
||||
function showNotification(message, type = 'info') {
|
||||
// Create toast notification
|
||||
const toastContainer = document.getElementById('toastContainer') || createToastContainer();
|
||||
|
||||
|
||||
const toast = document.createElement('div');
|
||||
toast.className = `toast align-items-center text-white bg-${type} border-0`;
|
||||
toast.setAttribute('role', 'alert');
|
||||
toast.setAttribute('aria-live', 'assertive');
|
||||
toast.setAttribute('aria-atomic', 'true');
|
||||
|
||||
|
||||
toast.innerHTML = `
|
||||
<div class="d-flex">
|
||||
<div class="toast-body">${message}</div>
|
||||
<button type="button" class="btn-close btn-close-white me-2 m-auto" data-bs-dismiss="toast" aria-label="Close"></button>
|
||||
</div>
|
||||
`;
|
||||
|
||||
|
||||
toastContainer.appendChild(toast);
|
||||
|
||||
|
||||
const bsToast = new bootstrap.Toast(toast, { delay: 3000 });
|
||||
bsToast.show();
|
||||
|
||||
|
||||
toast.addEventListener('hidden.bs.toast', () => {
|
||||
toast.remove();
|
||||
});
|
||||
@@ -499,13 +499,13 @@
|
||||
initDarkMode();
|
||||
initEditor();
|
||||
loadFileList();
|
||||
|
||||
|
||||
// Set up event listeners
|
||||
document.getElementById('saveBtn').addEventListener('click', saveFile);
|
||||
document.getElementById('deleteBtn').addEventListener('click', deleteFile);
|
||||
document.getElementById('newFileBtn').addEventListener('click', newFile);
|
||||
document.getElementById('darkModeToggle').addEventListener('click', toggleDarkMode);
|
||||
|
||||
|
||||
// Keyboard shortcuts
|
||||
document.addEventListener('keydown', (e) => {
|
||||
if ((e.ctrlKey || e.metaKey) && e.key === 's') {
|
||||
@@ -513,7 +513,7 @@
|
||||
saveFile();
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
console.log('Markdown Editor initialized');
|
||||
}
|
||||
|
||||
|
||||
@@ -364,4 +364,28 @@ body.dark-mode .btn-flat-danger {
|
||||
|
||||
body.dark-mode .btn-flat-warning {
|
||||
color: #ffda6a;
|
||||
}
|
||||
|
||||
/* Dark Mode Button Icon Styles */
|
||||
#darkModeBtn i {
|
||||
font-size: 16px;
|
||||
color: inherit;
|
||||
/* Inherit color from parent button */
|
||||
}
|
||||
|
||||
/* Light mode: moon icon */
|
||||
body:not(.dark-mode) #darkModeBtn i {
|
||||
color: var(--text-secondary);
|
||||
}
|
||||
|
||||
/* Dark mode: sun icon */
|
||||
body.dark-mode #darkModeBtn i {
|
||||
color: #ffc107;
|
||||
/* Warm sun color */
|
||||
}
|
||||
|
||||
/* Hover effects */
|
||||
#darkModeBtn:hover i {
|
||||
color: inherit;
|
||||
/* Inherit hover color from parent */
|
||||
}
|
||||
@@ -240,4 +240,14 @@ body.dark-mode .tree-empty-message {
|
||||
|
||||
.sidebar::-webkit-scrollbar-thumb:hover {
|
||||
background-color: var(--text-secondary);
|
||||
}
|
||||
|
||||
.new-collection-btn {
|
||||
padding: 0.375rem 0.75rem;
|
||||
font-size: 1rem;
|
||||
border-radius: 0.25rem;
|
||||
transition: all 0.2s ease;
|
||||
color: var(--text-primary);
|
||||
border: 1px solid var(--border-color);
|
||||
background-color: transparent;
|
||||
}
|
||||
@@ -232,6 +232,14 @@ body {
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
/* Iframe styles in preview - minimal defaults that can be overridden */
|
||||
#preview iframe {
|
||||
border: none;
|
||||
/* Default to no border, can be overridden by inline styles */
|
||||
display: block;
|
||||
/* Prevent inline spacing issues */
|
||||
}
|
||||
|
||||
/* View Mode Styles */
|
||||
body.view-mode #editorPane {
|
||||
display: none;
|
||||
|
||||
@@ -33,9 +33,14 @@ async function autoLoadPageInViewMode() {
|
||||
|
||||
// If we found a page to load, load it
|
||||
if (pageToLoad) {
|
||||
await editor.loadFile(pageToLoad);
|
||||
// Highlight the file in the tree and expand parent directories
|
||||
fileTree.selectAndExpandPath(pageToLoad);
|
||||
// Use fileTree.onFileSelect to handle both text and binary files
|
||||
if (fileTree.onFileSelect) {
|
||||
fileTree.onFileSelect({ path: pageToLoad, isDirectory: false });
|
||||
} else {
|
||||
// Fallback to direct loading (for text files only)
|
||||
await editor.loadFile(pageToLoad);
|
||||
fileTree.selectAndExpandPath(pageToLoad);
|
||||
}
|
||||
} else {
|
||||
// No files found, show empty state message
|
||||
editor.previewElement.innerHTML = `
|
||||
@@ -397,6 +402,9 @@ document.addEventListener('DOMContentLoaded', async () => {
|
||||
// Highlight the file in the tree
|
||||
fileTree.selectAndExpandPath(item.path);
|
||||
|
||||
// Save as last viewed page (for binary files too)
|
||||
editor.saveLastViewedPage(item.path);
|
||||
|
||||
// Update URL to reflect current file
|
||||
updateURL(currentCollection, item.path, isEditMode);
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ class DarkMode {
|
||||
this.isDark = !this.isDark;
|
||||
localStorage.setItem(Config.STORAGE_KEYS.DARK_MODE, this.isDark);
|
||||
this.apply();
|
||||
|
||||
|
||||
Logger.debug(`Dark mode ${this.isDark ? 'enabled' : 'disabled'}`);
|
||||
}
|
||||
|
||||
@@ -27,7 +27,7 @@ class DarkMode {
|
||||
if (this.isDark) {
|
||||
document.body.classList.add('dark-mode');
|
||||
const btn = document.getElementById('darkModeBtn');
|
||||
if (btn) btn.textContent = '☀️';
|
||||
if (btn) btn.innerHTML = '<i class="bi bi-sun-fill"></i>';
|
||||
|
||||
// Update mermaid theme
|
||||
if (window.mermaid) {
|
||||
@@ -36,7 +36,7 @@ class DarkMode {
|
||||
} else {
|
||||
document.body.classList.remove('dark-mode');
|
||||
const btn = document.getElementById('darkModeBtn');
|
||||
if (btn) btn.textContent = '🌙';
|
||||
if (btn) btn.innerHTML = '<i class="bi bi-moon-fill"></i>';
|
||||
|
||||
// Update mermaid theme
|
||||
if (window.mermaid) {
|
||||
|
||||
@@ -336,6 +336,60 @@ class MarkdownEditor {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Convert JSX-style attributes to HTML attributes
|
||||
* Handles style={{...}} and boolean attributes like allowFullScreen={true}
|
||||
*/
|
||||
convertJSXToHTML(content) {
|
||||
Logger.debug('Converting JSX to HTML...');
|
||||
|
||||
// Convert style={{...}} to style="..."
|
||||
// This regex finds style={{...}} and converts the object notation to CSS string
|
||||
content = content.replace(/style=\{\{([^}]+)\}\}/g, (match, styleContent) => {
|
||||
Logger.debug(`Found JSX style: ${match}`);
|
||||
|
||||
// Parse the object-like syntax and convert to CSS
|
||||
const cssRules = styleContent
|
||||
.split(',')
|
||||
.map(rule => {
|
||||
const colonIndex = rule.indexOf(':');
|
||||
if (colonIndex === -1) return '';
|
||||
|
||||
const key = rule.substring(0, colonIndex).trim();
|
||||
const value = rule.substring(colonIndex + 1).trim();
|
||||
|
||||
if (!key || !value) return '';
|
||||
|
||||
// Convert camelCase to kebab-case (e.g., paddingTop -> padding-top)
|
||||
const cssKey = key.replace(/([A-Z])/g, '-$1').toLowerCase();
|
||||
|
||||
// Remove quotes from value
|
||||
let cssValue = value.replace(/^['"]|['"]$/g, '');
|
||||
|
||||
return `${cssKey}: ${cssValue}`;
|
||||
})
|
||||
.filter(rule => rule)
|
||||
.join('; ');
|
||||
|
||||
Logger.debug(`Converted to CSS: style="${cssRules}"`);
|
||||
return `style="${cssRules}"`;
|
||||
});
|
||||
|
||||
// Convert boolean attributes like allowFullScreen={true} to allowfullscreen
|
||||
content = content.replace(/(\w+)=\{true\}/g, (match, attrName) => {
|
||||
Logger.debug(`Found boolean attribute: ${match}`);
|
||||
// Convert camelCase to lowercase for HTML attributes
|
||||
const htmlAttr = attrName.toLowerCase();
|
||||
Logger.debug(`Converted to: ${htmlAttr}`);
|
||||
return htmlAttr;
|
||||
});
|
||||
|
||||
// Remove attributes set to {false}
|
||||
content = content.replace(/\s+\w+=\{false\}/g, '');
|
||||
|
||||
return content;
|
||||
}
|
||||
|
||||
/**
|
||||
* Render preview from markdown content
|
||||
* Can be called with explicit content (for view mode) or from editor (for edit mode)
|
||||
@@ -355,11 +409,12 @@ class MarkdownEditor {
|
||||
}
|
||||
|
||||
try {
|
||||
// Step 1: Process macros
|
||||
let processedContent = markdown;
|
||||
// Step 0: Convert JSX-style syntax to HTML
|
||||
let processedContent = this.convertJSXToHTML(markdown);
|
||||
|
||||
// Step 1: Process macros
|
||||
if (this.macroProcessor) {
|
||||
const processingResult = await this.macroProcessor.processMacros(markdown);
|
||||
const processingResult = await this.macroProcessor.processMacros(processedContent);
|
||||
processedContent = processingResult.content;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user