aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoradam <adam@>2021-02-12 14:22:24 +0200
committeradam <adam@>2021-02-12 14:22:24 +0200
commit75640897d7ae44f10b9dde091d4b8dcba8e23776 (patch)
treea12ddea0e17f80ec9a1e4b12128cef0e0a12e257
parentbbd462f80f0b491caf15f0cc7fd8c7ed88e33ba6 (diff)
parent1de4d8dea14a9641206cd91613388ee5f228bae5 (diff)
downloadfileup-75640897d7ae44f10b9dde091d4b8dcba8e23776.tar.gz
Merge branch 'master' of https://github.com/alexvitkov/india
-rw-r--r--loggedin.js27
-rw-r--r--php/readdir.php3
-rw-r--r--php/upload.php2
-rw-r--r--sql/fileshare.sql4
4 files changed, 30 insertions, 6 deletions
diff --git a/loggedin.js b/loggedin.js
index 436719f..d774e16 100644
--- a/loggedin.js
+++ b/loggedin.js
@@ -8,7 +8,9 @@ const current_directory = document.getElementById("current_directory");
the_file.onchange = on_file_added;
-const files = [];
+var files = [];
+
+const pwd = "/";
const pending_uploads = [];
@@ -44,7 +46,26 @@ function on_file_added(_e) {
}
-function add_file_visuals(name, pending) {
+function load_dir(pwd) {
+ var data = new FormData();
+ data.append('path', '/');
+
+ var xhr = new XMLHttpRequest();
+ xhr.open('POST', '/php/readdir.php', true);
+ xhr.onload = function () {
+ for (const f of files)
+ f[1].remove();
+ files = [];
+
+ var json = JSON.parse(this.responseText);
+ for (const f of json) {
+ add_file_visuals(f.name, f.mimetype);
+ }
+ };
+ xhr.send(data);
+}
+
+function add_file_visuals(name, mimetype) {
var fileDiv = document.createElement('div');
var img = document.createElement('img');
@@ -68,3 +89,5 @@ function add_file_visuals(name, pending) {
function begin_upload() {
the_file.click();
}
+
+load_dir("/");
diff --git a/php/readdir.php b/php/readdir.php
index e69de29..b6a1916 100644
--- a/php/readdir.php
+++ b/php/readdir.php
@@ -0,0 +1,3 @@
+<?php
+echo '[ { "name": "file1.txt", "mimetype": "text/plain", "is_directory": false }, { "name": "file2.pdf", "mimetype": "application/pdf", "is_directory": false }, { "name": "dir", "mimetype": "", "is_directory": true } ] ';
+?>
diff --git a/php/upload.php b/php/upload.php
index 0aefefc..01ab6a6 100644
--- a/php/upload.php
+++ b/php/upload.php
@@ -9,8 +9,6 @@ if (!isset( $_POST["filename"]) || !isset($_FILES["the_file"]))
exit(1);
}
-echo "adsf";
-
$file = $_FILES["the_file"];
$filename= $_POST["filename"];
diff --git a/sql/fileshare.sql b/sql/fileshare.sql
index b3c9c6e..e3d9520 100644
--- a/sql/fileshare.sql
+++ b/sql/fileshare.sql
@@ -1,8 +1,8 @@
/*BEWARE!*/
-drop table if exists users;
-drop table if exists nodes;
drop table if exists node_access;
+drop table if exists users;
drop table if exists node_links;
+drop table if exists nodes;