alchemy-chimera 1.0.1 → 1.0.2

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.0.2 (2022-02-20)
+
+* Improve editor styling
+* Put editor errors in the Widget context
+* Add TOC to editor
+* Make sidebar sticky
+
 ## 1.0.1 (2022-01-28)
 
 * Allow setting a simple menu sidebar in the config

package/assets/stylesheets/chimera/chimera.scss

@@ -10,6 +10,7 @@ body {
 	--text-color: #475466;
 	--main-bg-color: #ebedf0;
 	--main-border-color: #dadee0;
+	
 	--button-bg-color: #F4F5F9;
 	--button-bg-hover-color: #e7e9f2;
 	--button-text-color: #3699FF;
@@ -31,27 +32,97 @@ body {
 }
 
 .btn {
+	//--button-bg-color: var(--context-background-color, --button-bg-color);
+	--local-text-color: var(--context-color, var(--button-text-color));
+	--local-border-color: var(--context-border-color, var(--button-border-color));
+
 	background-color: var(--button-bg-color);
+	color: var(--local-text-color);
+	border: 1px solid;
+	border-color: var(--local-border-color);
+
 	text-decoration: none;
-	color: var(--button-text-color);
 	line-height: 2rem;
 	min-width: 10rem;
 	text-align: center;
 	border-radius: 2px;
 	font-weight: 500;
 	cursor: pointer;
-	border: 1px solid;
 
 	&:hover {
 		background-color: var(--button-bg-hover-color);
+		//filter: brightness(1.05);
 	}
 }
 
+.primary {
+	--context-color: #084298;
+	--context-background-color: #cfe2ff;
+	--context-border-color: #b6d4fe;
+}
+
+.secondary {
+	--context-color: #41464b;
+	--context-background-color: #e2e3e5;
+	--context-border-color: #d3d6d8;
+}
+
+.success {
+	--context-color: #0f5132;
+	--context-background-color: #d1e7dd;
+	--context-border-color: #badbcc;
+}
+
+.danger,
+.error {
+	--context-color: #842029;
+	--context-background-color: #f8d7da;
+	--context-border-color: #f5c2c7;
+}
+
+.warning {
+	--context-color: #664d03;
+	--context-background-color: #fff3cd;
+	--context-border-color: #ffecb5;
+}
+
+.info {
+	--context-color: #055160;
+	--context-background-color: #cff4fc;
+	--context-border-color: #b6effb;
+}
+
+.light {
+	--context-color: #636464;
+	--context-background-color: #fefefe;
+	--context-border-color: #fdfdfe;
+}
+
+.dark {
+	--context-color: #141619;
+	--context-background-color: #d3d3d4;
+	--context-border-color: #bcbebf;
+}
+
+.alert-box {
+	color: var(--context-color);
+	background-color: var(--context-background-color);
+	border: 1px solid;
+	border-color: var(--context-border-color);
+	padding: 1rem;
+	margin: 1rem 0 1rem;
+}
+
 .chimera-sidebar {
 	background-color: var(--sidebar-bg-color);
 	flex: 0 0 14rem;
 	display: flex;
 	flex-flow: column;
+
+	.sidebar-widgets {
+		position: sticky;
+		top: 1rem;
+	}
 }
 
 .chimera-content {
@@ -92,6 +163,12 @@ body {
 .chimera-main {
 	flex: 1;
 	padding: 0.5rem;
+
+	&[data-he-template="chimera/widgets"] {
+		h1 {
+			padding-top: 0;
+		}
+	}
 }
 
 .main-widgets {
@@ -182,11 +259,21 @@ alchemy-table .aft-column-filters input {
 	width: 100%;
 }
 
+alchemy-form {
+	.error-area:not(:empty) {
+		@extend .error, .alert-box;
+		margin-top: 0;
+	}
+}
+
 alchemy-field {
 	border: 1px solid var(--color-box-border);
 	background-color: white;
 	border-radius: 4px;
 
+	// In case something goes wrong:
+	min-height: 1rem;
+
 	alchemy-label {
 		padding-left: 1rem;
 		line-height: 3rem;
@@ -232,6 +319,7 @@ alchemy-field {
 	.field {
 		display: flex;
 		padding: 1rem;
+		flex: 1;
 
 		> * {
 			flex: 1;
@@ -243,17 +331,107 @@ alchemy-field {
 		}
 	}
 
-	.field input[type="text"],
-	.field input[type="number"],
-	.field input[type="color"] {
-		@extend .chimera-input-field;
-		height: 3rem;
+	.field {
+		input[type="text"],
+		input[type="number"],
+		input[type="color"],
+		input[type="datetime-local"],
+		input[type="password"] {
+			@extend .chimera-input-field;
+			height: 3rem;
+		}
+
+		textarea {
+			@extend .chimera-input-field;
+			min-height: 5rem;
+			padding: 1rem;
+		}
+
+		input[type="color"] {
+			background-color: transparent;
+			border: none;
+			padding: 0;
+		}
+	}
+}
+
+alchemy-field-array {
+	.add-entry {
+		@extend .btn;
+		margin: 1rem 0 0 1rem;
 	}
 
-	.field input[type="color"] {
-		background-color: transparent;
+	button.remove {
+		@extend .btn;
+		@extend .danger;
+		min-width: 6rem;
+		margin: 0 1rem 1rem 0;
+	}
+
+	.entries {
+		margin-top: 0.5rem;
+	}
+
+	alchemy-field-array-entry:not(:last-of-type) {
+		//border-bottom: 1px solid gray;
+		position: relative;
+
+		&::after {
+			display: block;
+			content: " ";
+			background-color: lightgray;
+			position: absolute;
+			bottom: 0;
+			height: 1px;
+			left: 50%;
+			transform: translateX(-50%);
+			width: 80%;
+		}
+	}
+
+	alchemy-field-array-entry:not(:first-of-type) {
+		margin-top: 1rem;
+	}
+}
+
+.chimera-editor-widgets {
+
+	alchemy-widgets-column.toc-col {
+		flex: 1 1;
+	}
+
+	table-of-contents[elements-selector="alchemy-field"] {
+		align-self: start;
+		top: 2rem;
+		position: sticky;
+
+		ol {
+			list-style: none;
+			margin: 0 0 0 2rem;
+			padding: 0;
+
+			li {
+				a {
+					display: block;
+					line-height: 2rem;
+					border-bottom: 1px solid #aaa;
+					text-decoration: none;
+					opacity: 0.5;
+					color: #0070e4;
+				}
+			}
+	
+			li a.visible {
+				opacity: 1;
+			}
+		}
+	}
+}
+
+alchemy-field-schema {
+	alchemy-field {
 		border: none;
-		padding: 0;
+		margin-bottom: 1rem;
 	}
 }
 

package/controller/chimera_editor_controller.js

@@ -69,7 +69,7 @@ Editor.setAction(function index(conduit, model_name) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.0
- * @version  1.0.1
+ * @version  1.0.2
  *
  * @param    {Conduit}   conduit
  * @param    {String}    model_name
@@ -97,10 +97,8 @@ Editor.setAction(async function add(conduit, model_name) {
 
 			return conduit.redirect(url);
 		} catch (err) {
-			// @TODO: set this in the context somehow?
-			this.set('record_violations', err);
-
 			this.set('context_variables', {
+				form_violations : err,
 				record : record
 			});
 		}
@@ -125,7 +123,7 @@ Editor.setAction(async function add(conduit, model_name) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.0
- * @version  1.0.1
+ * @version  1.0.2
  *
  * @param    {Conduit}   conduit
  * @param    {String}    model_name
@@ -140,9 +138,9 @@ Editor.setAction(async function edit(conduit, model_name, pk_val) {
 	let record = await model.findByPk(pk_val);
 	let message_type = conduit.param('message');
 
-	this.set('context_variables', {
-		record : record
-	});
+	let context_variables = {
+		record,
+	};
 
 	if (conduit.method == 'post') {
 
@@ -152,11 +150,12 @@ Editor.setAction(async function edit(conduit, model_name, pk_val) {
 			await record.save();
 			message_type = 'saved';
 		} catch (err) {
-			// @TODO: set this in the context somehow?
-			this.set('record_violations', err);
+			context_variables.form_violations = err;
 		}
 	}
 
+	this.set('context_variables', context_variables);
+
 	let widget_config = model.chimera.getWidgetConfig('edit', conduit);
 
 	if (!widget_config.class_names) {

package/lib/chimera_config.js

@@ -65,7 +65,7 @@ Config.setMethod(function getFieldSet(name) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.0.0
- * @version  1.0.0
+ * @version  1.0.2
  *
  * @param    {String}   action
  * @param    {Conduit}  conduit
@@ -118,12 +118,43 @@ Config.setMethod(function getWidgetConfig(action, conduit) {
 								"level": 1,
 								"content": this.ModelClass.title + ' edit',
 							}
-						}, {
-							"type": "alchemy_form",
-							"config": {
-								model     : this.ModelClass.type_name,
-								view_type : 'edit',
-								widgets   : field_widgets
+						},
+						{
+							type: "row",
+							config: {
+								widgets: [
+									{
+										type: "column",
+										config: {
+											widgets: [
+												{
+													"type": "alchemy_form",
+													"config": {
+														model     : this.ModelClass.type_name,
+														view_type : 'edit',
+														widgets   : field_widgets
+													}
+												}
+											]
+										}
+									},
+									{
+										type: 'column',
+										config: {
+											wrapper_class_names: 'toc-col',
+											widgets: [
+												{
+													type: "table_of_contents",
+													config: {
+														parent_selector: 'alchemy-widgets-row',
+														elements_selector: 'alchemy-field',
+														title_selector: 'alchemy-label'
+													}
+												}
+											]
+										}
+									}
+								]
 							}
 						}
 					]

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "alchemy-chimera",
 	"description": "Chimera plugin for Alchemy MVC",
-	"version": "1.0.1",
+	"version": "1.0.2",
 	"author": "Jelle De Loecker <jelle@elevenways.be>",
 	"keywords": [
 		"alchemy",