alchemy-media 0.7.1 → 0.7.2

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.7.2 (2023-01-23)
+
+* Make `al-icon` center its contents
+* Make the file upload action use the extra given filename
+* Rename most route names & make them not-postponable
+
 ## 0.7.1 (2022-12-23)
 
 * Cascade `al-svg` role attribute to child `svg` elements

package/assets/stylesheets/media_elements/_icon.scss

@@ -1,12 +1,26 @@
 al-icon {
 	// inline-flex breaks certain (duotone) icons
-	//--fa-display: inline-flex;
+	--fa-display: inline-flex;
+	display: inline-flex;
 	flex-flow: column;
 	justify-content: center;
 	align-content: center;
 	text-align: center;
+	position: relative;
 
 	&[hidden] {
 		display: none !important;
 	}
+
+	// Fix Fontawesome duotone icons
+	&[icon-style="duotone"] {
+		position: relative;
+
+		&::before {
+			position: absolute;
+			top: 50%;
+			left: 50%;
+			transform: translate(-50%, -50%);
+		}
+	}
 }

package/bootstrap.js

@@ -40,32 +40,95 @@ alchemy.createDir(options.scratch);
 alchemy.createDir(options.cache);
 
 // Create routes
-Router.get('Media::static', /\/media\/static\/(.*)*/, 'MediaFile#serveStatic');
-Router.get('Media::image', options.url + '/{id}', 'MediaFile#image');
+Router.add({
+	name             : 'MediaFile#serveStatic',
+	methods          : ['get'],
+	can_be_postponed : false,
+	paths            : /\/media\/static\/(.*)*/,
+});
+
+Router.add({
+	name             : 'MediaFile#image',
+	methods          : ['get'],
+	can_be_postponed : false,
+	paths            : options.url + '/{id}',
+});
 
 // The prefix is added at the end of the route so it does not
 // change the user's active_prefix
-Router.get('MediaFile#data', '/media/data/{prefix}/{id}', 'MediaFile#data');
-Router.get('MediaFile#info', '/media/info', 'MediaFile#info');
+Router.add({
+	name             : 'MediaFile#data',
+	methods          : ['get'],
+	can_be_postponed : false,
+	paths            : '/media/data/{prefix}/{id}',
+});
 
 Router.add({
-	name       : 'MediaFile#recordsource',
-	methods    : ['get'],
-	paths      : '/media/recordsource',
-	permission : 'media.recordsource',
+	name             : 'MediaFile#info',
+	methods          : ['get'],
+	can_be_postponed : false,
+	paths            : '/media/info',
+});
+
+Router.add({
+	name             : 'MediaFile#recordsource',
+	methods          : ['get'],
+	can_be_postponed : false,
+	paths            : '/media/recordsource',
+	permission       : 'media.recordsource',
 });
 
 // Allow dummy extensions
-Router.get('Media::fileextension', '/media/file/{id}.{extension}', 'MediaFile#file');
+Router.add({
+	name             : 'Media#fileextension',
+	methods          : ['get'],
+	can_be_postponed : false,
+	paths            : '/media/file/{id}.{extension}',
+	handler          : 'MediaFile#file'
+});
 
 // Allow direct file downloads
-Router.get('Media::file', '/media/file/{id}', 'MediaFile#file');
-Router.get('Media#download', '/media/download/{id}', 'MediaFile#downloadFile');
+Router.add({
+	name             : 'MediaFile#file',
+	methods          : ['get'],
+	can_be_postponed : false,
+	paths            : '/media/file/{id}',
+});
 
-Router.get('Media::thumb', '/media/thumbnail/{id}', 'MediaFile#thumbnail');
-Router.get('Media::placeholder', '/media/placeholder', 'MediaFile#placeholder');
-Router.post('Media::upload', '/media/upload', 'MediaFile#upload');
-Router.post('Media::uploadsingle', '/media/uploadsingle', 'MediaFile#uploadsingle');
+Router.add({
+	name             : 'MediaFile#downloadFile',
+	methods          : ['get'],
+	can_be_postponed : false,
+	paths            : '/media/download/{id}',
+});
+
+Router.add({
+	name             : 'MediaFile#thumbnail',
+	methods          : ['get'],
+	can_be_postponed : false,
+	paths            : '/media/thumbnail/{id}',
+});
+
+Router.add({
+	name             : 'MediaFile#placeholder',
+	methods          : ['get'],
+	can_be_postponed : false,
+	paths            : '/media/placeholder',
+});
+
+Router.add({
+	name             : 'MediaFile#upload',
+	methods          : ['post'],
+	can_be_postponed : false,
+	paths            : '/media/upload',
+});
+
+Router.add({
+	name             : 'MediaFile#uploadsingle',
+	methods          : ['post'],
+	can_be_postponed : false,
+	paths            : '/media/uploadsingle',
+});
 
 var profiles = alchemy.shared('Media.profiles');
 

package/controller/media_files_controller.js

@@ -206,7 +206,7 @@ MediaFiles.setAction(function downloadFile(conduit, id, extension) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.0.1
- * @version  0.7.1
+ * @version  0.7.2
  *
  * @param    {Conduit}   conduit
  */
@@ -215,7 +215,7 @@ MediaFiles.setAction(function upload(conduit) {
 	var MediaFile = this.getModel('MediaFile'),
 	    files = conduit.files,
 	    tasks = [],
-		accept = conduit.body?.accept;
+	    accept = conduit.body?.accept;
 
 	if (files && files.files && typeof files.files == 'object') {
 		files = files.files;
@@ -225,12 +225,19 @@ MediaFiles.setAction(function upload(conduit) {
 		let file = files[key];
 
 		tasks.push(async next => {
+
+			let filename = file.name;
+
+			if (key == 'uploaded_file' && conduit.body.filename) {
+				filename = conduit.body.filename;
+			}
+
 			let options = {
 				move: true,
-				filename: file.name
+				filename: filename,
 			};
 
-			let name = file.name.split('.');
+			let name = filename.split('.');
 
 			// Remove the last piece if there are more than 1
 			if (name.length > 1) {

package/helper/media_helper.js

@@ -230,7 +230,7 @@ Media.setMethod(function applyDirective(element, image, options) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.4.0
- * @version  0.4.0
+ * @version  0.7.2
  *
  * @param    {String}   image_id
  *
@@ -240,7 +240,7 @@ Media.setMethod(function fileAnchor(file_id, options) {
 
 	var url;
 
-	return this.view.helpers.Router.printRoute('Media::file', {id: file_id}, options);
+	return this.view.helpers.Router.printRoute('MediaFile#file', {id: file_id}, options);
 });
 
 /**
@@ -248,7 +248,7 @@ Media.setMethod(function fileAnchor(file_id, options) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  0.5.1
+ * @version  0.7.2
  *
  * @param    {String}   image_id
  *
@@ -269,7 +269,7 @@ Media.setMethod(function imageUrl(image_id, options) {
 		if (options.route) {
 			routeName = options.route;
 		} else {
-			routeName = 'Media::image';
+			routeName = 'MediaFile#image';
 		}
 
 		url = this.parseURL(this.view.helpers.Router.routeUrl(routeName, {id: image_id}));
@@ -311,7 +311,7 @@ Media.setMethod(function imageUrl(image_id, options) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  0.6.2
+ * @version  0.7.2
  *
  * @param    {Object}   options
  *
@@ -321,7 +321,7 @@ Media.setMethod(function placeholderUrl(options) {
 
 	var url;
 
-	url = this.parseURL(this.view.helpers.Router.routeUrl('Media::placeholder'));
+	url = this.parseURL(this.view.helpers.Router.routeUrl('MediaFile#placeholder'));
 
 	if (options != null) {
 

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "alchemy-media",
 	"description": "The media plugin for Alchemy",
-	"version": "0.7.1",
+	"version": "0.7.2",
 	"repository": {
 		"type" : "git",
 		"url"  : "https://github.com/11ways/alchemy-media.git"
@@ -12,7 +12,7 @@
 		"veronica"      : "~0.2.2"
 	},
 	"peerDependencies": {
-		"alchemymvc" : ">=1.2.0"
+		"alchemymvc" : ">=1.3.0"
 	},
 	"license": "MIT",
 	"engines": {

package/view/form/inputs/view_inline/file.hwk

@@ -3,6 +3,6 @@
 {% if value %}
 	<img
 		!Media={% value %}
-		+media-route="Media::thumb"
+		+media-route="MediaFile#thumbnail"
 	>
 {% /if %}

package/view/form/inputs/view_inline/file_preview.hwk

@@ -3,6 +3,6 @@
 {% if value %}
 	<img
 		!Media={% value %}
-		+media-route="Media::thumb"
+		+media-route="MediaFile#thumbnail"
 	>
 {% /if %}