Implement new route, tweak UI

MGatner · MGatner · commit b3c101ab6a77 · 2020-10-22T00:11:51.000Z
diff --git a/README.md b/README.md
@@ -52,7 +52,8 @@ Default routes:
 * **files/thumbnail/{fileId}** - Displays the thumbnail for a file
 
 CRUD:
-* **files/upload** - Accepts upload requests from Dropzone
+* **files/new** - Basic Dropzone form
+* **files/upload** - Accepts AJAX upload requests from Dropzone
 * **files/delete/{fileId}** - Removes a file
 * **files/rename/{fileId}** - Accepts POST data to rename a file
 
diff --git a/src/Controllers/Files.php b/src/Controllers/Files.php
@@ -176,8 +176,8 @@ public function user($userId = null)
 
 			$this->setData([
 				'access'   => 'display',
-				'title'    => 'User Files',
-				'username' => 'User',
+				'title'    => 'All Files',
+				'username' => '',
 			]);
 		}
 		// Logged in, looking at another user
@@ -215,6 +215,22 @@ public function user($userId = null)
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * Display the Dropzone uploader.
+	 *
+	 * @return ResponseInterface|string
+	 */
+	public function new()
+	{
+		// Check for create permission
+		if (! $this->model->mayCreate())
+		{
+			return $this->failure(403, lang('Permits.notPermitted'));
+		}
+
+		return view('Tatter\Files\Views\new');
+	}
+
 	/**
 	 * Displays or processes the form to rename a file.
 	 *
diff --git a/src/Views/layout.php b/src/Views/layout.php
@@ -7,14 +7,17 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 	<meta name="description" content="">
 	<meta name="author" content="Matthew Gatner">
-	<title>Files</title>
+	<title><?= $title ?? 'Files' ?></title>
 
 	<?= service('assets')->tag('vendor/jquery/jquery.min.js') ?>
 	<?= service('assets')->tag('vendor/bootstrap/bootstrap.min.css') ?>
 	<?= service('assets')->tag('vendor/font-awesome/css/all.min.css') ?>
 	<?= service('assets')->tag('vendor/dropzone/dropzone.min.css') ?>
 
 	<?= service('alerts')->css() ?>
+
+	<?= $this->renderSection('headerAssets') ?>
+
 </head>
 <body>
 	<nav class="navbar navbar-expand-md navbar-dark bg-dark">
@@ -31,6 +34,9 @@
 				<li class="nav-item <?= ($menu === 'user') ? 'active' : '' ?>">
 					<a class="nav-link" href="<?= site_url('files/user') ?>">User Files <?= ($menu === 'user') ? '<span class="sr-only">(current)</span>' : '' ?></a>
 				</li>
+				<li class="nav-item <?= ($menu === 'new') ? 'active' : '' ?>">
+					<a class="nav-link" href="<?= site_url('files/new') ?>" data-toggle="modal" data-target="#dropzoneModal">Add Files</a>
+				</li>
 			</ul>
 		</div>
 	</nav>
@@ -46,5 +52,7 @@
 	<?= service('assets')->tag('vendor/bootstrap/bootstrap.bundle.min.js') ?>
 	<?= service('assets')->tag('vendor/dropzone/dropzone.min.js') ?>
 
+	<?= $this->renderSection('footerAssets') ?>
+
 </body>
 </html>
diff --git a/src/Views/new.php b/src/Views/new.php
@@ -0,0 +1,17 @@
+<?= $this->extend(config('Files')->layouts[$layout ?? 'public']) ?>
+<?= $this->section('main') ?>
+
+	<?= view('Tatter\Files\Views\Dropzone\modal') ?>
+
+<?= $this->endSection() ?>
+<?= $this->section('footerAssets') ?>
+
+	<?= view(config('Files')->views['dropzone']) ?>
+
+<script>
+$(function() {
+	$('#dropzoneModal').modal('show');
+});
+</script>
+
+<?= $this->endSection() ?>
