Merge branch 'dev' of gitlab.com:plasmicplexus/HyperBooru-Server into dev

2 files changed, 5 insertions, 10 deletions

diff --git a/Controllers/MediaController.cs b/Controllers/MediaController.cs
index 3ccfc1d..b7c8314 100644
--- a/Controllers/MediaController.cs
+++ b/Controllers/MediaController.cs
@@ -28,10 +28,6 @@ public class MediaController : Controller {
         inspector = inspectorBuilder.Build();
     }
 
-    [HttpGet("list")]
-    public IActionResult EnumerateMedia() =>
-        Ok(db.Media.Select(m => m.ObjectId).ToArray());
-
     [HttpGet("{mediaId}")]
     public IActionResult Fetch([FromRoute] Guid mediaId) {
         var media = db.Media.First(m => m.Guid == mediaId);
@@ -165,6 +161,6 @@ public class MediaController : Controller {
         db.SaveChanges();
         transaction.Commit();
 
-        return Ok(media.Guid);
+        return Redirect($"/ViewMedia?m={media.Guid}");
     }
 }
\ No newline at end of file
diff --git a/Pages/Upload.razor b/Pages/Upload.razor
index c139aef..a9a1667 100644
--- a/Pages/Upload.razor
+++ b/Pages/Upload.razor
@@ -4,8 +4,7 @@
 
 <div id="dropzone">
     <p>Drag a file to upload it</p>
-    <input type="file" accept="image/*"/>
-</div>
-
-@code {
-}
\ No newline at end of file
+    <form id="upload" action="/media" method="post" enctype="multipart/form-data">
+        <input type="file" id="myFile" name="filename" accept="image/*,video/*"/>
+    </form>
+</div>
\ No newline at end of file