Skip to content

Node.js based forum software built for the modern web

feat: update uploads to look nicer ™️

Barış Soner Uşaklı5cdf3aa5c917
diff --git a/public/language/en-GB/uploads.json b/public/language/en-GB/uploads.json
index 4aca2bce1e..b56203bb59 100644
--- a/public/language/en-GB/uploads.json
+++ b/public/language/en-GB/uploads.json
@@ -5,5 +5,7 @@
"maximum-file-size": "Maximum %1 kb",
"no-uploads-found": "No uploads found",
"public-uploads-info": "Uploads are public, all visitors can see them.",
- "private-uploads-info": "Uploads are private, only logged in users can see them."
+ "private-uploads-info": "Uploads are private, only logged in users can see them.",
+ "delete-upload": "Delete Upload",
+ "delete-upload-confirm": "Are you sure you want to delete this upload?"
}
\ No newline at end of file
diff --git a/public/src/client/account/uploads.js b/public/src/client/account/uploads.js
index 2a8884622e..3a5f4f3bb8 100644
--- a/public/src/client/account/uploads.js
+++ b/public/src/client/account/uploads.js
@@ -1,6 +1,6 @@
'use strict';
-define('forum/account/uploads', ['forum/account/header', 'alerts'], function (header, alerts) {
+define('forum/account/uploads', ['forum/account/header', 'alerts', 'modals'], function (header, alerts, modals) {
const AccountUploads = {};
AccountUploads.init = function () {
@@ -9,12 +9,14 @@ define('forum/account/uploads', ['forum/account/header', 'alerts'], function (he
$('[data-action="delete"]').on('click', function () {
const el = $(this).parents('[data-name]');
const name = el.attr('data-name');
-
- socket.emit('user.deleteUpload', { name: name, uid: ajaxify.data.uid }, function (err) {
- if (err) {
- return alerts.error(err);
- }
- el.remove();
+ modals.confirm('[[uploads:delete-upload-confirm]]', function (ok) {
+ if (!ok) return;
+ socket.emit('user.deleteUpload', { name: name, uid: ajaxify.data.uid }, function (err) {
+ if (err) {
+ return alerts.error(err);
+ }
+ el.remove();
+ });
});
return false;
});
diff --git a/src/controllers/accounts/uploads.js b/src/controllers/accounts/uploads.js
index 5b0ee256f6..18a93df3a1 100644
--- a/src/controllers/accounts/uploads.js
+++ b/src/controllers/accounts/uploads.js
@@ -1,6 +1,7 @@
'use strict';
const path = require('path');
+const mime = require('mime').default;
const nconf = require('nconf');
@@ -15,7 +16,7 @@ uploadsController.get = async function (req, res) {
const payload = res.locals.userData;
const { username, userslug } = payload;
const page = Math.max(1, parseInt(req.query.page, 10) || 1);
- const itemsPerPage = 25;
+ const itemsPerPage = 24;
const start = (page - 1) * itemsPerPage;
const stop = start + itemsPerPage - 1;
const [itemCount, uploadNames] = await Promise.all([
@@ -26,6 +27,7 @@ uploadsController.get = async function (req, res) {
payload.uploads = uploadNames.map(uploadName => ({
name: uploadName,
url: path.posix.join(nconf.get('upload_url'), uploadName),
+ isImage: mime.getType(uploadName)?.startsWith('image/'),
}));
const pageCount = Math.ceil(itemCount / itemsPerPage);
payload.pagination = pagination.create(page, pageCount, req.query);