From 9a12a7e8162673bd0d9ef135c97919446d600503 Mon Sep 17 00:00:00 2001
From: BanceDev <lanceaborden@protonmail.com>
Date: Fri, 4 Oct 2024 16:48:02 -0400
Subject: [PATCH 1/4] drag and drop files into folders

---
 public/js/dashboard.js    | 16 ++++++++++++++++
 views/dashboard/files.erb | 17 +++++++++++++++--
 views/dashboard/index.erb |  9 ++++++++-
 3 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/public/js/dashboard.js b/public/js/dashboard.js
index 33eb40d2..5e2d9c2f 100644
--- a/public/js/dashboard.js
+++ b/public/js/dashboard.js
@@ -30,6 +30,22 @@ function hideUploadProgress() {
   $('#uploadingOverlay').css('display', 'none')
 }
 
+function showMovingProgress() {
+  $('#movingOverlay').css('display', 'block');
+}
+
+function hideMovingProgress() {
+  $('#movingOverlay').css('display', 'none');
+}
+
+function moveFile(fileName, folderName) {
+  console.log(fileName);
+  console.log(folderName);
+  $('#moveCurrentPath').val(fileName.slice(1));
+  $('#moveNewPath').val(folderName + fileName);
+  $('#moveFileForm').submit();
+}
+
 $('#createDir').on('shown', function () {
   $('#newDirInput').focus();
 })
diff --git a/views/dashboard/files.erb b/views/dashboard/files.erb
index b207e719..e6776625 100644
--- a/views/dashboard/files.erb
+++ b/views/dashboard/files.erb
@@ -1,3 +1,16 @@
+<script>
+function moveFileToFolder(event, folderName) {
+  event.preventDefault();
+  event.stopPropagation();
+
+  const fullUrl = event.dataTransfer.getData('text/uri-list');
+  const url = new URL(fullUrl);
+  const relativeUrl = url.pathname;
+
+  moveFile(relativeUrl, folderName);
+}
+</script>
+
 <div id="uploadingOverlay" class="uploading-overlay" style="display: none">
   <div class="uploading">
       <p>Uploading, please wait...</p>
@@ -58,7 +71,7 @@
               <div class="overlay"></div>
             </div>
           <% elsif file[:is_directory] %>
-            <div class="html-thumbnail folder fileimagehover" ondrop="moveFileToFolder(event)">
+            <div class="html-thumbnail folder fileimagehover" ondrop="moveFileToFolder(event, '<%= file[:path] %>')" ondragover="event.preventDefault()">
               <div class="folder-icon"></div>
               <div class="overlay"></div>
             </div>
@@ -105,4 +118,4 @@
       <% end %>
     </div>
   </form>
-</div>
\ No newline at end of file
+</div>
diff --git a/views/dashboard/index.erb b/views/dashboard/index.erb
index eccb1219..6170bc62 100644
--- a/views/dashboard/index.erb
+++ b/views/dashboard/index.erb
@@ -112,6 +112,13 @@
         </form>
       </div>
 
+      <form id="moveFileForm" method="post" action="/site_files/rename">
+          <input type="hidden" value="<%= csrf_token %>" name="csrf_token">
+          <input type="hidden" value="<%= @dir %>" name="dir">
+          <input type="hidden" id="moveCurrentPath" name="path">
+          <input type="hidden" id="moveNewPath" name="new_path">
+      </form>
+
 
 <div class="site-actions" style="margin-bottom:25px">
   <% if !current_site.plan_feature(:no_file_restrictions) %>
@@ -170,4 +177,4 @@
   </form>
 </div>
 
-<script src="/js/dashboard.js"><script>
\ No newline at end of file
+<script src="/js/dashboard.js"><script>

From 39095a1fd945c711e1863977ccd0a214e7d98035 Mon Sep 17 00:00:00 2001
From: BanceDev <lanceaborden@protonmail.com>
Date: Fri, 4 Oct 2024 17:09:27 -0400
Subject: [PATCH 2/4] can drag files up using breadcrumbs

---
 public/js/dashboard.js    |  7 +++----
 views/dashboard/files.erb | 14 ++++++++------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/public/js/dashboard.js b/public/js/dashboard.js
index 5e2d9c2f..09702d7b 100644
--- a/public/js/dashboard.js
+++ b/public/js/dashboard.js
@@ -38,11 +38,10 @@ function hideMovingProgress() {
   $('#movingOverlay').css('display', 'none');
 }
 
-function moveFile(fileName, folderName) {
-  console.log(fileName);
-  console.log(folderName);
+function moveFile(fileName, folderName, dragBack) {
   $('#moveCurrentPath').val(fileName.slice(1));
-  $('#moveNewPath').val(folderName + fileName);
+  fileName = fileName.split('/').pop(); 
+  $('#moveNewPath').val(folderName + '/' +fileName);
   $('#moveFileForm').submit();
 }
 
diff --git a/views/dashboard/files.erb b/views/dashboard/files.erb
index e6776625..483c95b3 100644
--- a/views/dashboard/files.erb
+++ b/views/dashboard/files.erb
@@ -1,13 +1,13 @@
 <script>
-function moveFileToFolder(event, folderName) {
+function moveFileToFolder(event, folderName, dragBack) {
   event.preventDefault();
   event.stopPropagation();
 
   const fullUrl = event.dataTransfer.getData('text/uri-list');
   const url = new URL(fullUrl);
-  const relativeUrl = url.pathname;
+  let relativeUrl = url.pathname;
 
-  moveFile(relativeUrl, folderName);
+  moveFile(relativeUrl, folderName, dragBack);
 }
 </script>
 
@@ -32,14 +32,16 @@ function moveFileToFolder(event, folderName) {
     <% if params[:dir].nil? || params[:dir].empty? || params[:dir] == '/' %>
       Home
     <% else %>
-      <a href="/dashboard">Home</a>
+      <a href="/dashboard" ondrop="moveFileToFolder(event, '', true)" ondragover="event.preventDefault()">Home</a>
     <% end %>
 
     <% if @dir %>
       <% dir_array = @dir.split '/' %>
       <% dir_array.each_with_index do |dir,i| %>
         <% if i+1 < dir_array.length %>
-          <a href="/dashboard?dir=<%= Rack::Utils.escape dir_array[1..i].join('/') %>"><%= dir %></a> <i class="fa fa-angle-right"></i>
+          <a href="/dashboard?dir=<%= Rack::Utils.escape dir_array[1..i].join('/') %>" 
+           ondrop="moveFileToFolder(event, '<%= dir_array[1..i].join('/') %>', true)" 
+           ondragover="event.preventDefault()"><%= dir %></a> <i class="fa fa-angle-right"></i>
         <% else %>
           <%= dir %>
         <% end %>
@@ -71,7 +73,7 @@ function moveFileToFolder(event, folderName) {
               <div class="overlay"></div>
             </div>
           <% elsif file[:is_directory] %>
-            <div class="html-thumbnail folder fileimagehover" ondrop="moveFileToFolder(event, '<%= file[:path] %>')" ondragover="event.preventDefault()">
+            <div class="html-thumbnail folder fileimagehover" ondrop="moveFileToFolder(event, '<%= file[:path] %>', false)" ondragover="event.preventDefault()">
               <div class="folder-icon"></div>
               <div class="overlay"></div>
             </div>

From 5e60cd3148cf4e87c0a12e034e6f66db562dc11d Mon Sep 17 00:00:00 2001
From: BanceDev <lanceaborden@protonmail.com>
Date: Fri, 4 Oct 2024 17:21:17 -0400
Subject: [PATCH 3/4] made file move js more concise

---
 public/js/dashboard.js    | 11 +++++++++--
 views/dashboard/files.erb | 13 -------------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/public/js/dashboard.js b/public/js/dashboard.js
index 09702d7b..103cb5bb 100644
--- a/public/js/dashboard.js
+++ b/public/js/dashboard.js
@@ -38,10 +38,17 @@ function hideMovingProgress() {
   $('#movingOverlay').css('display', 'none');
 }
 
-function moveFile(fileName, folderName, dragBack) {
+function moveFileToFolder(event, folderName, dragBack) {
+  event.preventDefault();
+  event.stopPropagation();
+
+  const fullUrl = event.dataTransfer.getData('text/uri-list');
+  const url = new URL(fullUrl);
+  let fileName = url.pathname;
+
   $('#moveCurrentPath').val(fileName.slice(1));
   fileName = fileName.split('/').pop(); 
-  $('#moveNewPath').val(folderName + '/' +fileName);
+  $('#moveNewPath').val(folderName + '/' + fileName);
   $('#moveFileForm').submit();
 }
 
diff --git a/views/dashboard/files.erb b/views/dashboard/files.erb
index 483c95b3..e9a615c4 100644
--- a/views/dashboard/files.erb
+++ b/views/dashboard/files.erb
@@ -1,16 +1,3 @@
-<script>
-function moveFileToFolder(event, folderName, dragBack) {
-  event.preventDefault();
-  event.stopPropagation();
-
-  const fullUrl = event.dataTransfer.getData('text/uri-list');
-  const url = new URL(fullUrl);
-  let relativeUrl = url.pathname;
-
-  moveFile(relativeUrl, folderName, dragBack);
-}
-</script>
-
 <div id="uploadingOverlay" class="uploading-overlay" style="display: none">
   <div class="uploading">
       <p>Uploading, please wait...</p>

From 105b34e5bba839bc34ad7414f5ee73c603aeb76e Mon Sep 17 00:00:00 2001
From: BanceDev <lanceaborden@protonmail.com>
Date: Sat, 5 Oct 2024 10:38:27 -0400
Subject: [PATCH 4/4] removed unused flag for drag and drop

---
 public/js/dashboard.js    | 2 +-
 views/dashboard/files.erb | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/js/dashboard.js b/public/js/dashboard.js
index 103cb5bb..02817aab 100644
--- a/public/js/dashboard.js
+++ b/public/js/dashboard.js
@@ -38,7 +38,7 @@ function hideMovingProgress() {
   $('#movingOverlay').css('display', 'none');
 }
 
-function moveFileToFolder(event, folderName, dragBack) {
+function moveFileToFolder(event, folderName) {
   event.preventDefault();
   event.stopPropagation();
 
diff --git a/views/dashboard/files.erb b/views/dashboard/files.erb
index e9a615c4..c49208c9 100644
--- a/views/dashboard/files.erb
+++ b/views/dashboard/files.erb
@@ -19,7 +19,7 @@
     <% if params[:dir].nil? || params[:dir].empty? || params[:dir] == '/' %>
       Home
     <% else %>
-      <a href="/dashboard" ondrop="moveFileToFolder(event, '', true)" ondragover="event.preventDefault()">Home</a>
+      <a href="/dashboard" ondrop="moveFileToFolder(event, '')" ondragover="event.preventDefault()">Home</a>
     <% end %>
 
     <% if @dir %>
@@ -27,7 +27,7 @@
       <% dir_array.each_with_index do |dir,i| %>
         <% if i+1 < dir_array.length %>
           <a href="/dashboard?dir=<%= Rack::Utils.escape dir_array[1..i].join('/') %>" 
-           ondrop="moveFileToFolder(event, '<%= dir_array[1..i].join('/') %>', true)" 
+           ondrop="moveFileToFolder(event, '<%= dir_array[1..i].join('/') %>')" 
            ondragover="event.preventDefault()"><%= dir %></a> <i class="fa fa-angle-right"></i>
         <% else %>
           <%= dir %>
@@ -60,7 +60,7 @@
               <div class="overlay"></div>
             </div>
           <% elsif file[:is_directory] %>
-            <div class="html-thumbnail folder fileimagehover" ondrop="moveFileToFolder(event, '<%= file[:path] %>', false)" ondragover="event.preventDefault()">
+            <div class="html-thumbnail folder fileimagehover" ondrop="moveFileToFolder(event, '<%= file[:path] %>')" ondragover="event.preventDefault()">
               <div class="folder-icon"></div>
               <div class="overlay"></div>
             </div>