Upload 7 files

editor.html

@@ -13,84 +13,133 @@
     <link href="css/editor.css" rel="stylesheet">
     
     <script>
-    // Add authentication check for save operations
+    // Enhanced authentication and file loading for GitHub integration
     window.addEventListener('DOMContentLoaded', function() {
-        // Override the default save function to ensure authentication
-        if (typeof Vvveb !== 'undefined') {
-            const originalSaveAjax = Vvveb.Builder.saveAjax;
-            Vvveb.Builder.saveAjax = function(data, saveUrl, callback, error) {
-                // The authentication is handled server-side via HTTP Basic Auth
-                return originalSaveAjax.call(this, data, saveUrl, callback, error);
-            };
-        }
-        
-        // Check if we need authentication for the editor
+        // Check authentication first
         fetch('save.php?action=checkAuth', {
             method: 'GET',
             credentials: 'include'
         }).then(response => {
             if (response.status === 401) {
-                // Redirect to config page which will handle authentication
-                window.location.href = 'config.php';
+                // Redirect to login page
+                window.location.href = '/';
+                return;
             }
+            
+            // If authenticated, load file list
+            loadFileList();
         }).catch(err => {
-            console.log('Auth check failed, continuing anyway');
+            console.log('Auth check failed:', err);
+            // Redirect to login page on error
+            window.location.href = '/';
         });
-
-        // File loading functionality
+        
+        // GitHub-aware file loading functionality
         function loadFileList() {
-            fetch('save.php?action=list')
+            fetch('save.php?action=listFiles')
                 .then(response => response.json())
                 .then(data => {
+                    console.log('File list response:', data);
                     const selector = document.getElementById('file-selector');
-                    selector.innerHTML = '<option value="">Select a file...</option>';
-                    
-                    if (data.success && data.files) {
-                        data.files.forEach(file => {
-                            const option = document.createElement('option');
-                            option.value = file.filename;
-                            option.textContent = file.title || file.filename;
-                            selector.appendChild(option);
-                        });
+                    if (selector) {
+                        selector.innerHTML = '<option value="">Select a file...</option>';
+                        
+                        if (data.success && data.files && data.files.length > 0) {
+                            data.files.forEach(file => {
+                                const option = document.createElement('option');
+                                option.value = file.name || file.filename || file.path;
+                                option.textContent = file.name || file.filename || 'Untitled';
+                                selector.appendChild(option);
+                            });
+                            
+                            // Show user info
+                            console.log(`Loaded ${data.files.length} files for user: ${data.user}`);
+                        } else {
+                            console.log('No files found or error loading files');
+                        }
                     }
                 })
-                .catch(error => console.error('Error loading file list:', error));
+                .catch(error => {
+                    console.error('Error loading file list:', error);
+                });
         }
 
-        // Load file when selected
-        document.getElementById('load-file-btn').addEventListener('click', function() {
-            const selector = document.getElementById('file-selector');
-            const filename = selector.value;
-            
+        // Enhanced file loading with GitHub support
+        function loadFileFromGitHub(filename) {
             if (!filename) {
                 alert('Please select a file to load');
                 return;
             }
             
-            fetch(`save.php?action=load&filename=${encodeURIComponent(filename)}`)
+            console.log('Loading file from GitHub:', filename);
+            
+            fetch(`save.php?action=loadFile&file=${encodeURIComponent(filename)}`)
                 .then(response => response.json())
                 .then(data => {
+                    console.log('Load file response:', data);
                     if (data.success) {
-                        // Load the HTML content into the editor
-                        Vvveb.Builder.loadHtml(data.html);
-                        // Update the page title input if it exists
-                        const titleInput = document.getElementById('page-title');
-                        if (titleInput && data.title) {
-                            titleInput.value = data.title;
+                        // Use VvvebJs API to load HTML content
+                        if (typeof Vvveb !== 'undefined' && Vvveb.Builder) {
+                            Vvveb.Builder.loadHtml(data.content);
+                            console.log('File loaded successfully from GitHub');
+                            
+                            // Update current file reference
+                            window.currentFile = filename;
+                            
+                            // Update page title if available
+                            const titleMatch = data.content.match(/<title>(.*?)<\/title>/i);
+                            if (titleMatch) {
+                                const titleInput = document.querySelector("input[name=title]");
+                                if (titleInput) titleInput.value = titleMatch[1];
+                            }
+                        } else {
+                            console.warn('VvvebJs not ready yet, retrying...');
+                            setTimeout(() => loadFileFromGitHub(filename), 1000);
                         }
-                        console.log('File loaded successfully');
                     } else {
                         alert('Error loading file: ' + (data.message || 'Unknown error'));
                     }
                 })
                 .catch(error => {
                     console.error('Error loading file:', error);
-                    alert('Error loading file');
+                    alert('Error loading file from GitHub');
                 });
-        });
+        }
 
-        // Load file list on page load
-        loadFileList();
+        // Load file when selected from dropdown
+        const loadFileBtn = document.getElementById('load-file-btn');
+        if (loadFileBtn) {
+            loadFileBtn.addEventListener('click', function() {
+                const selector = document.getElementById('file-selector');
+                const filename = selector ? selector.value : '';
+                loadFileFromGitHub(filename);
+            });
+        }
+
+        // Make functions globally available
+        window.loadFileList = loadFileList;
+        window.loadFileFromGitHub = loadFileFromGitHub;
+        
+        // Override the default save function to ensure proper authentication
+        window.setTimeout(() => {
+            if (typeof Vvveb !== 'undefined' && Vvveb.Builder) {
+                const originalSaveAjax = Vvveb.Builder.saveAjax;
+                Vvveb.Builder.saveAjax = function(data, saveUrl, callback, error) {
+                    console.log('Saving to GitHub via:', saveUrl);
+                    return originalSaveAjax.call(this, data, saveUrl, callback, error);
+                };
+                
+                // Add file refresh functionality
+                const originalCallback = Vvveb.Builder.saveAjax;
+                Vvveb.Builder.saveAjax = function(data, saveUrl, callback, error) {
+                    return originalSaveAjax.call(this, data, saveUrl, function(result) {
+                        if (callback) callback(result);
+                        // Refresh file list after save
+                        setTimeout(loadFileList, 1000);
+                    }, error);
+                };
+            }
+        }, 2000);
     });
     </script>
   </head>
@@ -124,14 +173,17 @@
 					  </button>
 					</div>
 					
-					<!-- File loading dropdown -->
+					 <!-- Enhanced File loading dropdown with GitHub support -->
 					<div class="btn-group me-3" role="group">
-						<select class="form-select" id="file-selector" title="Select file to load">
-							<option value="">Select a file...</option>
+						<select class="form-select" id="file-selector" title="Select file to load from GitHub">
+							<option value="">Loading files...</option>
 						</select>
-						<button class="btn btn-light" title="Load selected file" id="load-file-btn">
+						<button class="btn btn-light" title="Load selected file from GitHub" id="load-file-btn">
 							<i class="la la-folder-open"></i>
 						</button>
+						<button class="btn btn-light" title="Refresh file list" onclick="window.loadFileList && window.loadFileList()">
+							<i class="la la-refresh"></i>
+						</button>
 					</div>
 					
 					<div class="btn-group me-3" role="group">
@@ -159,16 +211,16 @@
 					
 								
 					<div class="btn-group me-2 float-end" role="group">
-					  <button class="btn btn-primary btn-sm btn-icon save-btn" title="Save (Ctrl + S)" id="save-btn" data-vvveb-action="saveAjax" data-vvveb-url="save.php" data-v-vvveb-shortcut="ctrl+e">
+					  <button class="btn btn-primary btn-sm btn-icon save-btn" title="Save to GitHub (Ctrl + S)" id="save-btn" data-vvveb-action="saveAjax" data-vvveb-url="save.php" data-v-vvveb-shortcut="ctrl+e">
 
 						<span class="loading d-none">
 						<i class="icon-save-outline"></i>
 						  <span class="spinner-border spinner-border-sm align-middle" role="status" aria-hidden="true">
 						  </span>
-						  <span>Saving </span> ... </span>
+						  <span>Saving to GitHub</span> ... </span>
 
 						<span class="button-text">
-						  <i class="icon-save-outline"></i> <span>Save page</span>
+						  <i class="icon-save-outline"></i> <span>Save to GitHub</span>
 						</span>	
 
 					  </button>

editor.php

@@ -1,61 +1,179 @@
 <?php
 require_once 'user-manager.php';
+require_once 'storage.php';
 
 // Initialize user manager and require login
 $userManager = new UserManager();
-$userManager->requireLogin();
+if (!$userManager->isLoggedIn()) {
+    header('Location: index.html');
+    exit;
+}
 
 $currentUser = $userManager->getCurrentUser();
 
+// Initialize storage manager for GitHub file access
+$storageManager = new StorageManager();
+
 // Get the editor HTML
 $html = file_get_contents('editor.html');
 
-// Search for HTML files in user's directory and demo folder
-$userDir = "user-files/$currentUser";
+// Get user files from GitHub storage
+$files = '';
 $userFiles = [];
-if (is_dir($userDir)) {
-    $userFiles = glob("$userDir/*.html");
+
+try {
+    $githubFiles = $storageManager->listFiles();
+    
+    // Add user files from GitHub
+    foreach ($githubFiles as $file) {
+        if (in_array($file['name'], array('new-page-blank-template.html', 'editor.html'))) continue;
+        
+        $pathInfo = pathinfo($file['name']);
+        $filename = $pathInfo['filename'];
+        $folder = 'My Files (GitHub)';
+        $url = $file['path'];
+        $name = $filename;
+        $title = ucfirst($name);
+        
+        $files .= '<li class="file" data-url="' . htmlspecialchars($url) . '" data-folder="' . htmlspecialchars($folder) . '">';
+        $files .= '<label class="folder-name">' . htmlspecialchars($folder) . '</label>';
+        $files .= '<div class="file-name"><span>' . htmlspecialchars($title) . '</span> <div class="file-actions">';
+        $files .= '<button class="btn btn-sm btn-light load-file-btn" data-file="' . htmlspecialchars($url) . '">Load</button>';
+        $files .= '</div></div></li>';
+        
+        $userFiles[] = [
+            'filename' => $url,
+            'title' => $title,
+            'folder' => $folder
+        ];
+    }
+} catch (Exception $e) {
+    error_log("Editor: Error loading GitHub files: " . $e->getMessage());
+}
+
+// Fallback: check local user files as backup
+$localUserDir = "user-files/$currentUser";
+if (is_dir($localUserDir)) {
+    $localFiles = glob("$localUserDir/*.html");
+    
+    foreach ($localFiles as $file) {
+        if (in_array(basename($file), array('new-page-blank-template.html', 'editor.html'))) continue;
+        $pathInfo = pathinfo($file);
+        $filename = $pathInfo['filename'];
+        $folder = 'Local Files';
+        $url = str_replace(__DIR__ . DIRECTORY_SEPARATOR, '', $file);
+        $url = str_replace('\\', '/', $url);
+        $name = $filename;
+        $title = ucfirst($name);
+        
+        $files .= '<li class="file" data-url="' . htmlspecialchars($url) . '" data-folder="' . htmlspecialchars($folder) . '">';
+        $files .= '<label class="folder-name">' . htmlspecialchars($folder) . '</label>';
+        $files .= '<div class="file-name"><span>' . htmlspecialchars($title) . '</span> <div class="file-actions">';
+        $files .= '<button class="btn btn-sm btn-light load-file-btn" data-file="' . htmlspecialchars($url) . '">Load</button>';
+        $files .= '</div></div></li>';
+        
+        $userFiles[] = [
+            'filename' => $url,
+            'title' => $title,
+            'folder' => $folder
+        ];
+    }
 }
 
 // Also include demo files for reference
 $demoFiles = array_merge(glob('demo/*/*.html'), glob('demo/*.html'));
 
-$files = '';
-
-// Add user files first
-foreach ($userFiles as $file) {
+foreach ($demoFiles as $file) {
     if (in_array(basename($file), array('new-page-blank-template.html', 'editor.html'))) continue;
     $pathInfo = pathinfo($file);
     $filename = $pathInfo['filename'];
-    $folder = 'My Files';
+    $folder = ucfirst(basename(dirname($file)));
     $url = $file;
     $name = $filename;
     $title = ucfirst($name);
-    $files .= "{name:'$name', file:'$file', title:'$title', url: '$url', folder:'$folder', editable: true},";
+    
+    $files .= '<li class="file" data-url="' . htmlspecialchars($url) . '" data-folder="' . htmlspecialchars($folder) . '">';
+    $files .= '<label class="folder-name">' . htmlspecialchars($folder) . ' (Demo)</label>';
+    $files .= '<div class="file-name"><span>' . htmlspecialchars($title) . '</span> <div class="file-actions">';
+    $files .= '<button class="btn btn-sm btn-light load-file-btn" data-file="' . htmlspecialchars($url) . '">Load</button>';
+    $files .= '</div></div></li>';
 }
 
-// Add demo files (read-only)
-foreach ($demoFiles as $file) {
-    if (in_array($file, array('new-page-blank-template.html', 'editor.html'))) continue;
-    $pathInfo = pathinfo($file);
-    $filename = $pathInfo['filename'];
-    $folder = preg_replace('@/.+?$@', '', $pathInfo['dirname']);
-    $subfolder = preg_replace('@^.+?/@', '', $pathInfo['dirname']);
-    if ($filename == 'index' && $subfolder) {
-        $filename = $subfolder;
-    }
-    $url = $pathInfo['dirname'] . '/' . $pathInfo['basename'];
-    $name = $filename;
-    $title = ucfirst($name) . ' (Demo)';
-    $files .= "{name:'$name', file:'$file', title:'$title', url: '$url', folder:'$folder', editable: false},";
+// Add user info and file list to the HTML
+$userInfo = '<div class="user-info alert alert-info">';
+$userInfo .= '<strong>当前用户:</strong> ' . htmlspecialchars($currentUser);
+$userInfo .= '<br><strong>存储:</strong> ' . StorageConfig::getStorageType();
+$userInfo .= '<br><strong>GitHub文件:</strong> ' . count($githubFiles ?? []) . ' 个';
+if (isset($localFiles)) {
+    $userInfo .= '<br><strong>本地缓存:</strong> ' . count($localFiles) . ' 个';
 }
+$userInfo .= '</div>';
+
+// Inject JavaScript for file management
+$fileManagementScript = '
+<script>
+window.vvvebUserFiles = ' . json_encode($userFiles) . ';
+window.vvvebCurrentUser = "' . htmlspecialchars($currentUser) . '";
 
-// Replace files list from html with the dynamic list
-$html = str_replace('= defaultPages;', " = [$files];", $html);
+// Enhanced file loading with GitHub support
+function loadFileFromGitHub(filename) {
+    console.log("Loading file from GitHub:", filename);
+    
+    fetch("save.php?action=loadFile&file=" + encodeURIComponent(filename))
+        .then(response => response.json())
+        .then(data => {
+            if (data.success) {
+                Vvveb.Builder.loadHtml(data.content);
+                console.log("File loaded successfully from GitHub");
+                
+                // Update current file reference
+                window.currentFile = filename;
+                
+                // Update page title if available
+                const titleMatch = data.content.match(/<title>(.*?)<\/title>/i);
+                if (titleMatch) {
+                    const titleInput = document.querySelector("input[name=title]");
+                    if (titleInput) titleInput.value = titleMatch[1];
+                }
+            } else {
+                alert("Error loading file: " + (data.message || "Unknown error"));
+            }
+        })
+        .catch(error => {
+            console.error("Error loading file:", error);
+            alert("Error loading file from GitHub");
+        });
+}
+
+// Override the existing file loading
+document.addEventListener("DOMContentLoaded", function() {
+    // Add enhanced file loading for GitHub files
+    document.querySelectorAll(".load-file-btn").forEach(btn => {
+        btn.addEventListener("click", function() {
+            const filename = this.getAttribute("data-file");
+            loadFileFromGitHub(filename);
+        });
+    });
+    
+    // Add refresh button for file list
+    const refreshBtn = document.createElement("button");
+    refreshBtn.className = "btn btn-sm btn-secondary";
+    refreshBtn.innerHTML = "🔄 刷新文件列表";
+    refreshBtn.onclick = function() {
+        location.reload();
+    };
+    
+    const fileManager = document.querySelector("#filemanager .file-manager-header");
+    if (fileManager) {
+        fileManager.appendChild(refreshBtn);
+    }
+});
+</script>';
 
-// Add user info to the page
-$userInfo = "<script>window.currentUser = '$currentUser';</script>";
-$html = str_replace('</head>', "$userInfo</head>", $html);
+// Insert user info and files into the HTML
+$html = str_replace('<!--files-li-->', $files, $html);
+$html = str_replace('</head>', $fileManagementScript . '</head>', $html);
+$html = str_replace('<div id="filemanager">', '<div id="filemanager">' . $userInfo, $html);
 
 echo $html;
 ?>

save.php

@@ -29,8 +29,8 @@ function checkAuth() {
         return true;
     }
     
-    // No authentication found
-    header('Location: login.html');
+    // No authentication found - redirect to index.html which is the login page
+    header('Location: index.html');
     exit;
 }
 

user-manager.php

@@ -44,7 +44,7 @@ class UserManager {
     
     public function requireLogin() {
         if (!$this->isLoggedIn()) {
-            header('Location: login.html');
+            header('Location: index.html');
             exit;
         }
     }