divhunt 2.0.9 → 2.0.10

package/addons/core/commands/front/directives/run.js

@@ -18,6 +18,11 @@ directives.ItemAdd({
 	},
 	code: function(data, item, compile, node, identifier)
 	{
+		if(node.tagName.toLowerCase() !== 'dh-command')
+		{
+			return;
+		}
+
 		const config = {};
 		const methods = {};
 
@@ -74,6 +79,7 @@ directives.ItemAdd({
 			}
 			finally
 			{
+				
 				compile.data[config.bind] = state;
 				compile.data.Update();
 			}

package/addons/core/commands/front/directives/submit.js

@@ -26,20 +26,21 @@ directives.ItemAdd({
 		methods.init = () =>
 		{
 			methods.config();
+			methods.state();
+			methods.element();
+			methods.handler();
+		};
 
-			if(compile.data[config.bind] !== undefined)
+		methods.state = () =>
+		{
+			if(!compile.data[config.bind])
 			{
-				return;
+				compile.data[config.bind] = {
+					response: null,
+					error: null,
+					loading: false
+				};
 			}
-
-			compile.data[config.bind] = {
-				response: null,
-				error: null,
-				loading: false
-			};
-
-			methods.element();
-			methods.handler();
 		};
 
 		methods.config = () =>
@@ -85,15 +86,17 @@ directives.ItemAdd({
 
 		methods.submit = async () =>
 		{
-			const state = compile.data[config.bind];
+			compile.data[config.bind];
 
-			if(state.loading)
+			if(compile.data[config.bind].loading)
 			{
 				return;
 			}
 
-			state.loading = true;
-			state.error = null;
+			compile.data[config.bind].loading = true;
+			compile.data[config.bind].error = null;
+
+			console.log(compile.data[config.bind]);
 
 			compile.data.Update();
 
@@ -104,24 +107,23 @@ directives.ItemAdd({
 					? await commands.Fn('api', config.command, formData)
 					: await commands.Fn('run', config.command, formData);
 
-				state.response = result;
-				state.error    = null;
-				state.loading  = false;
+				compile.data[config.bind].response = result;
+				compile.data[config.bind].error    = null;
+				compile.data[config.bind].loading  = false;
 
 				config.reset && config.form.reset();
-				config.onSuccess && config.onSuccess(state);
+				config.onSuccess && config.onSuccess(compile.data[config.bind]);
 			}
 			catch(error)
 			{
-				state.response = null;
-				state.error    = error.message;
-				state.loading  = false;
+				compile.data[config.bind].response = null;
+				compile.data[config.bind].error    = error.message;
+				compile.data[config.bind].loading  = false;
 
-				config.onError && config.onError(state);
+				config.onError && config.onError(compile.data[config.bind]);
 			}
 			finally
 			{
-				compile.data[config.bind] = state;
 				compile.data.Update();
 			}
 		};

package/addons/render/assets/back/functions/import.js

@@ -18,7 +18,7 @@ const map =
     sources:    { js: 'addons/modules/sources/front' },
     directives: { js: 'addons/render/directives/front' },
     transforms: { js: 'addons/render/transforms/front' },
-    pages:      { js: 'addons/render/pages/front', css: 'addons/render/pages/front' },
+    pages:      { js: 'addons/render/pages', css: 'addons/render/pages/front' },
     elements:   { js: 'addons/render/elements/front', css: 'addons/render/elements/front' },
     float:      { js: 'addons/float', css: 'addons/float' }
 };

package/addons/render/pages/{front/js/#register → core}/addon.js

@@ -1,3 +1,5 @@
+import divhunt from '#framework/load.js';
+
 const pages = divhunt.Addon('pages', (addon) =>
 {
 	addon.Field('id', ['string']);
@@ -27,3 +29,5 @@ const pages = divhunt.Addon('pages', (addon) =>
 	addon.Field('element', ['object']);
 	addon.Field('404', ['boolean', false]);
 });
+
+export default pages;

package/addons/render/pages/core/load.js

@@ -0,0 +1,3 @@
+import pages from './addon.js';
+
+export default pages;

package/addons/render/pages/front/items/directives/change.js

@@ -0,0 +1,38 @@
+directives.ItemAdd({
+	id: 'dh-page',
+	icon: 'file',
+	name: 'Page',
+	description: 'Navigate to a page on render',
+	category: 'navigation',
+	trigger: 'node',
+	order: 666,
+	strict: false,
+	tag: 'dh-page',
+	attributes: {
+		'route': ['string', null, true],
+		'parameters': ['object', {}],
+		'history': ['boolean', true],
+		'timeout': ['number', 0]
+	},
+	code: function(data, item, compile, node, identifier)
+	{
+		const route = data['route'].value;
+		const parameters = data['parameters'].value;
+		const push = data['history'].value;
+		const timeout = data['timeout'].value;
+
+		const change = () =>
+		{
+			pages.Fn('change', route, parameters, { path: true, push });
+		};
+
+		if(timeout > 0)
+		{
+			setTimeout(change, timeout);
+		}
+		else
+		{
+			change();
+		}
+	}
+});

package/examples/basic-front/back/assets.js

@@ -1,4 +1,5 @@
 import assets from 'divhunt/assets';
+import 'divhunt/pages';
 
 import { dirname, resolve } from 'path';
 import { fileURLToPath } from 'url';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "divhunt",
-    "version": "2.0.9",
+    "version": "2.0.10",
     "description": "Full-stack isomorphic JavaScript framework built from scratch. One addon abstraction powers databases, servers, commands, pages, directives, queues, and more.",
     "type": "module",
     "main": "lib/load.js",
@@ -16,6 +16,7 @@
         "./commands": "./addons/core/commands/core/load.js",
         "./queue": "./addons/core/queue/back/load.js",
         "./assets": "./addons/render/assets/back/load.js",
+        "./pages": "./addons/render/pages/core/load.js",
         "./html": "./addons/render/html/load.js",
         "./tags": "./addons/render/tags/load.js",
         "./sources": "./addons/modules/sources/back/load.js",
@@ -31,6 +32,7 @@
         "#assets/*": "./addons/render/assets/back/*",
         "#html/*": "./addons/render/html/*",
         "#directives/*": "./addons/render/directives/*",
+        "#pages/*": "./addons/render/pages/*",
         "#elements/*": "./addons/render/elements/*",
         "#tags/*": "./addons/render/tags/*",
         "#sources/*": "./addons/modules/sources/*",

package/test/front/test.js

@@ -11,20 +11,43 @@ pages.Item({
         content: function()
         {
             return `
-                {{ name }}
+                1
                 <h1>dh-command test</h1>
-
-                <dh-command command="test" :api="true" bind="test2" :data='{"name": "dejan"}'>
+                <dh-command-submit command="test" :api="true" bind="test" :data='{"name": "dejan"}'>
+                    <input name="name" placeholder="Name"/>
+                    <button type="submit">Send</button>
                     <p dh-if="test.loading">Loading...</p>
                     <p dh-if="test.error">Error: {{test.error}}</p>
-                    <p dh-if="test.response">{{test.response.message}}</p>
-                </dh-command>
+                    <div dh-if="test.response">dsas<dh-page route="/2"></dh-page></div>
+                </dh-command-submit>
+            `;
+        }
+    }
+});
 
-                <dh-command command="test" :api="true" bind="test" :data='{"name": "dejan"}'>
+
+pages.Item({
+    id: 'hom2e',
+    route: '/2',
+    title: 'dh-command test',
+    grid: {
+        template: '"content"',
+        columns: '1fr',
+        rows: '1fr'
+    },
+    areas: {
+        content: function()
+        {
+            return `
+                2
+                <h1>dh-command test</h1>
+                <dh-command-submit command="test" :api="true" bind="test" :data='{"name": "dejan"}'>
+                    <input name="name" placeholder="Name"/>
+                    <button type="submit">Send</button>
                     <p dh-if="test.loading">Loading...</p>
                     <p dh-if="test.error">Error: {{test.error}}</p>
-                    <p dh-if="test.response">{{test.response.message}}</p>
-                </dh-command>
+                    <div dh-if="test.response">dsas<dh-page route="/"></dh-page></div>
+                </dh-command-submit>
             `;
         }
     }

package/test.js

@@ -5,6 +5,7 @@ const root = resolve(dirname(fileURLToPath(import.meta.url)));
 
 import assets from './addons/render/assets/back/load.js';
 import commands from './addons/core/commands/core/load.js';
+import pages from './addons/render/pages/core/load.js';
 import html from './addons/render/html/load.js';
 
 assets.Fn('import', ['framework', 'directives', 'commands', 'pages']);

package/addons/render/pages/front/js/items/commands/change.js

@@ -1,41 +0,0 @@
-divhunt.AddonReady('commands', (commands) =>
-{
-    commands.Item({
-        id: 'pages:change',
-        method: 'POST',
-        endpoint: '/api/pages/change',
-        exposed: true,
-        description: 'Navigate to a page by ID or path',
-        in: {
-            id: ['string', null],
-            path: ['string', null],
-            parameters: ['object', {}],
-            push: ['boolean', true]
-        },
-        out: {
-            id: ['string'],
-            parameters: ['object'],
-            url: ['string']
-        },
-        callback: async function(props)
-        {
-            if(!props.id && !props.path)
-            {
-                throw new Error('Either id or path is required.');
-            }
-
-            const target = props.path || props.id;
-            const result = await pages.Fn('change', target, props.parameters || {}, {
-                path: !!props.path,
-                push: props.push !== false
-            });
-
-            if(result.code !== 200)
-            {
-                throw new Error(result.message);
-            }
-
-            return result.data;
-        }
-    });
-});

package/addons/render/pages/front/js/items/shortcuts/home.js

@@ -1,9 +0,0 @@
-divhunt.AddonReady('shortcuts', (shortcuts) =>
-{
-    shortcuts.Item({
-        id: 'pages:home',
-        key: 'meta+1',
-        description: 'Navigate to home page',
-        command: { id: 'pages:change', path: '/' }
-    });
-});

package/addons/render/pages/front/js/items/shortcuts/login.js

@@ -1,9 +0,0 @@
-divhunt.AddonReady('shortcuts', (shortcuts) =>
-{
-    shortcuts.Item({
-        id: 'pages:login',
-        key: 'meta+2',
-        description: 'Navigate to login page',
-        command: { id: 'pages:change', path: '/login' }
-    });
-});