npm - neo.mjs - Versions diffs - 6.9.10 → 6.9.12 - Mend

neo.mjs 6.9.10 → 6.9.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (245) hide show

package/apps/ServiceWorker.mjs CHANGED Viewed

@@ -20,9 +20,9 @@ class ServiceWorker extends ServiceBase {
          */
         singleton: true,
         /**
-         * @member {String} version='6.9.10'
+         * @member {String} version='6.9.12'
          */
-        version: '6.9.10'
+        version: '6.9.12'
     }
     /**

package/apps/learnneo/index.html CHANGED Viewed

@@ -5,12 +5,13 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta charset="UTF-8">
     <title>LearnNeo</title>
-    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans|Inconsolata">
-    </link>
+    <link href="https://fonts.googleapis.com/css2?family=Source+Code+Pro:ital,wght@0,300;0,400;0,500;0,600;0,700;1,300;1,400;1,500;1,600;1,700&family=Source+Sans+3:ital,wght@0,300;0,400;0,500;0,600;0,700;0,800;1,300;1,400;1,500;1,600;1,700;1,800&family=Source+Serif+4:ital,opsz,wght@0,8..60,400;0,8..60,500;0,8..60,600;0,8..60,700;1,8..60,400;1,8..60,500;1,8..60,600;1,8..60,700&display=swap" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/icon?family=Material+Icons"
+      rel="stylesheet">
 </head>
 <body>
     <script src="../../src/MicroLoader.mjs" type="module"></script>
 </body>
-</html>
+</html>

package/apps/learnneo/neo-config.json CHANGED Viewed

@@ -3,5 +3,6 @@
     "basePath"        : "../../",
     "environment"     : "development",
     "mainPath"        : "./Main.mjs",
-    "mainThreadAddons": ["DragDrop", "HighlightJS", "Stylesheet", "Markdown"]
+    "mainThreadAddons": ["DragDrop", "HighlightJS", "Stylesheet", "Markdown"],
+    "themes"          : ["neo-theme-neo-light"]
 }

package/apps/learnneo/store/Content.mjs CHANGED Viewed

@@ -53,7 +53,7 @@ class Content extends Store {
     }
     get contentPath() {
-        return `../../../resources/data/${this.deck}`;
+        return `../../../resources/data/deck/${this.deck}`;
     }
     doLoadStore() {
         debugger;

package/apps/learnneo/view/Viewport.mjs CHANGED Viewed

@@ -27,6 +27,24 @@ class Viewport extends BaseViewport {
          */
         layout: {ntype: 'card'}
     }
+    /**
+     *
+     */
+    onConstructed() {
+        super.onConstructed();
+        let me = this;
+        Neo.Main.getByPath({path: 'location.search'})
+            .then(data => {
+                const searchString = data?.substr(1) || '';
+                const search       = searchString ? JSON.parse(`{"${decodeURI(searchString.replace(/&/g, "\",\"").replace(/=/g, "\":\""))}"}`) : {};
+                me.deck            = search.deck || 'learnneo';
+                me.addCls(me.deck);
+            })
+    }
 }
 Neo.applyClassConfig(Viewport);

package/apps/learnneo/view/ViewportController.mjs CHANGED Viewed

@@ -1,10 +1,10 @@
-import Component from '../../../src/controller/Component.mjs';
+import Controller from '../../../src/controller/Component.mjs';
 /**
  * @class LearnNeo.view.ViewportController
  * @extends Neo.controller.Component
  */
-class ViewportController extends Component {
+class ViewportController extends Controller {
     static config = {
         /**
          * @member {String} className='LearnNeo.view.ViewportController'

package/apps/learnneo/view/home/ContentTreeList.mjs CHANGED Viewed

@@ -1,5 +1,5 @@
 import ContentStore from '../../store/Content.mjs'
-import TreeList from '../../../../src/tree/List.mjs';
+import TreeList     from '../../../../src/tree/List.mjs';
 /**
  * @class LearnNeo.view.home.ContentTreeList
@@ -16,16 +16,18 @@ class ContentTreeList extends TreeList {
          * @member {String[]} cls=['topics-tree']
          */
         cls: ['topics-tree'],
+        /**
+         * @member {Boolean} showCollapseExpandAllIcons=false
+         */
+        showCollapseExpandAllIcons: false,
         /**
          * @member {Neo.data.Store} store=ContentStore
          */
-        store: ContentStore,
-        cls: 'topics-tree'
+        store: ContentStore
     }
     get contentPath() {
-        return `../../../resources/data/${this.deck}`;
+        return `../../resources/data/deck/${this.deck}`
     }
     /**
@@ -33,19 +35,24 @@ class ContentTreeList extends TreeList {
      * @returns {Promise<void>}
      */
     async doFetchContent(record) {
-        let me = this,
+        let me   = this,
             path = `${me.contentPath}`;
         path += record.path ? `/pages/${record.path}` : `/p/${record.id}.md`;
         if (record.isLeaf && path) {
-            const data = await fetch(path);
+            const data    = await fetch(path);
             const content = await data.text();
             await Neo.main.addon.Markdown.markdownToHtml(content)
                 .then(
-                    html => me.fire('contentChange', {component: me, html}),
-                    () => me.fire('contentChange', {component: me}));
+                    html => me.fire('contentChange', {
+                        component: me,
+                        html,
+                        record,
+                        isLab    : record.name?.startsWith('Lab:')
+                    }),
+                    () => me.fire('contentChange', {component: me}))
         }
     }
@@ -60,7 +67,7 @@ class ContentTreeList extends TreeList {
             // TODO: Tree lists should do this themselves when their store is loaded.
             me.store.data = data.json.data;
             me.createItems(null, me.getListItemsRoot(), 0);
-            me.update();
+            me.update()
         })
     }
@@ -75,11 +82,12 @@ class ContentTreeList extends TreeList {
         Neo.Main.getByPath({path: 'location.search'})
             .then(data => {
                 const searchString = data?.substr(1) || '';
-                const search = searchString ? JSON.parse(`{"${decodeURI(searchString.replace(/&/g, "\",\"").replace(/=/g, "\":\""))}"}`) : {};
-                me.deck = search.deck || 'learnneo';
+                const search       = searchString ? JSON.parse(`{"${decodeURI(searchString.replace(/&/g, "\",\"").replace(/=/g, "\":\""))}"}`) : {};
+                me.deck            = search.deck || 'learnneo';
                 me.doLoadStore();
                 console.log(search);
-            });
+            })
     }
     /**
@@ -87,7 +95,7 @@ class ContentTreeList extends TreeList {
      */
     onLeafItemClick(record) {
         super.onLeafItemClick(record);
-        this.doFetchContent(record);
+        this.doFetchContent(record)
     }
 }

package/apps/learnneo/view/home/ContentView.mjs ADDED Viewed

@@ -0,0 +1,60 @@
+import Component from '../../../../src/component/Base.mjs';
+/**
+ * @class LearnNeo.view.home.ContentView
+ * @extends Neo.component.Base
+ */
+class ContentView extends Component {
+    static config = {
+        /**
+         * @member {String} className='LearnNeo.view.home.ContentView'
+         * @protected
+         */
+        className: 'LearnNeo.view.home.ContentView',
+        /**
+         * @member {String[]} baseCls=['learn-content']
+         * @protected
+         */
+        baseCls: ['learn-content']
+    }
+    /**
+     * @member {Object} record=null
+     */
+    record = null
+    /**
+     * @param {Object} data
+     */
+    onClick(data) {
+        let me     = this,
+            record = me.record;
+        if (data.altKey && data.shiftKey && !data.metaKey) {
+            me.fire('edit', {component: me, record})
+        }
+        // Command/windows shift click = refresh
+        else if (!data.altKey && data.shiftKey && data.metaKey) {
+            me.fire('refresh', {component: me, record})
+        }
+    }
+    /**
+     *
+     */
+    onConstructed() {
+        super.onConstructed();
+        let me = this;
+        me.addDomListeners({
+            click: me.onClick,
+            scope: me
+        })
+    }
+}
+Neo.applyClassConfig(ContentView);
+export default ContentView;

package/apps/learnneo/view/home/MainContainer.mjs CHANGED Viewed

@@ -1,5 +1,5 @@
 import Container               from '../../../../src/container/Base.mjs';
-import ContentComponent        from './ContentComponent.mjs';
+import ContentView             from './ContentView.mjs';
 import ContentTreeList         from './ContentTreeList.mjs';
 import MainContainerController from './MainContainerController.mjs';
 import MainContainerModel      from './MainContainerModel.mjs';
@@ -20,6 +20,8 @@ class MainContainer extends Container {
          * @member {Neo.controller.Component} controller=MainContainerController
          */
         controller: MainContainerController,
+        cls: 'learnneo-maincontainer',
         /**
          * @member {Object[]} items
          */
@@ -28,19 +30,25 @@ class MainContainer extends Container {
             layout  : 'fit',
             minWidth: 350,
             width   : 350,
+            cls     : 'sidenav-container',
             items: [{
                 module   : ContentTreeList,
                 reference: 'tree',
-                listeners: {contentChange: 'onContentListLeafClick'}
+                listeners: {
+                    contentChange: 'onContentChange',
+                }
             }]
         }, {
             module      : Splitter,
             resizeTarget: 'previous',
-            size        : 5
+            size        : 4
         }, {
-            module   : ContentComponent,
-            reference: 'content'
+            module   : ContentView,
+            reference: 'content',
+            listeners: {
+                edit   : 'onContentEdit',
+                refresh: 'onContentRefresh'
+            }
         }],
         /**
          * @member {Object} layout={ntype:'hbox',align:'stretch'}

package/apps/learnneo/view/home/MainContainerController.mjs CHANGED Viewed

@@ -1,11 +1,10 @@
-import Component from '../../../../src/controller/Component.mjs';
+import Controller from '../../../../src/controller/Component.mjs';
 /**
  * @class LearnNeo.view.home.MainContainerController
  * @extends Neo.controller.Component
  */
-class MainContainerController extends Component {
+class MainContainerController extends Controller {
     static config = {
         /**
          * @member {String} className='LearnNeo.view.home.MainContainerController'
@@ -14,17 +13,40 @@ class MainContainerController extends Component {
         className: 'LearnNeo.view.home.MainContainerController'
     }
+    /**
+     *
+     */
+    onConstructed() {
+        super.onConstructed();
+        Neo.Main.getByPath({path: 'location.search'})
+            .then(data => {
+                const searchString = data?.substr(1) || '';
+                const search = searchString ? JSON.parse(`{"${decodeURI(searchString.replace(/&/g, "\",\"").replace(/=/g, "\":\""))}"}`) : {};
+                this.getModel().setData('deck', search.deck || 'learnneo');
+            });
+        fetch('../../../../resources/data/deck/EditorConfig.json')
+            .then(response => response.json()
+            .then(data =>
+                this.getModel().setData('editorConfig', data)
+            ))
+    }
     /**
      * @param {Object} data
+     * @returns {Promise<void>}
      */
-    async onContentListLeafClick(data) {
-        const
-            me      = this,
+    async onContentChange(data) {
+        let me      = this,
             content = me.getReference('content');
-        content.html = data.html;
+        content.toggleCls('lab', data.isLab);
+        content.html   = data.html;
+        content.record = data.record;
-        await this.timeout(200);
+        await me.timeout(200);
         // todo: we need to add the links as neo configs
         await Neo.main.addon.HighlightJS.loadLibrary({
@@ -33,25 +55,42 @@ class MainContainerController extends Component {
             themePath      : '../../docs/resources/highlightjs-custom-github-theme.css'
         });
-        await this.timeout(200);
+        await me.timeout(200);
         Neo.main.addon.HighlightJS.syntaxHighlightInit({
             appName: me.appName,
             vnodeId: content.id
         })
-        // contentContainer.removeAll();
-        // contentContainer.add({
-        //     ntype: 'component',
-        //     html: data.html
-        // });
-        // contentContainer.layout.activeIndex = 0;
     }
-    get contentPath() {
-        return `../../../resources/data/${this.deck}`;
+    /**
+     * @param {Object} data
+     * @returns {Promise<void>}
+     */
+    async onContentEdit(data) {
+        const vm = this.getModel();
+        console.log(data);
+        const editorConfig = vm.getData('editorConfig');
+        const subDir = vm.getData('deck')
+        if (!editorConfig || !subDir) return;
+        const filePath = `${editorConfig.root}/${subDir}/p/${data.record.id}.md`;
+        await fetch('http://localhost:3000/openInEditor', {
+            method: 'POST',
+            headers: {
+                "Content-Type": "application/json",
+            },
+            body: JSON.stringify({path: filePath, editor: editorConfig.editor})
+        })
     }
+    /**
+     * @param {Object} data
+     */
+    onContentRefresh(data) {
+        this.getReference('tree').doFetchContent(data.record)
+    }
 }
 Neo.applyClassConfig(MainContainerController);

package/apps/learnneo/view/home/MainContainerModel.mjs CHANGED Viewed

@@ -1,6 +1,5 @@
 import Component from '../../../../src/model/Component.mjs';
-import Tree from '../../store/Content.mjs';
-import Store from '../../../../src/data/Store.mjs';
+import Store     from '../../store/Content.mjs';
 /**
  * @class LearnNeo.view.home.MainContainerModel
@@ -22,9 +21,8 @@ class MainContainerModel extends Component {
          */
         stores: {
             tree: {
-                // module: Tree,
-                module: Store,
-                responseRoot: "data",
+                module      : Store,
+                responseRoot: 'data'
             }
         }
     }

package/apps/newwebsite/app.mjs ADDED Viewed

@@ -0,0 +1,6 @@
+import MainContainer from './view/MainContainer.mjs';
+export const onStart = () => Neo.app({
+    mainView: MainContainer,
+    name    : 'NewWebsite'
+})

package/apps/newwebsite/index.html ADDED Viewed

@@ -0,0 +1,13 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta charset="UTF-8">
+    <title>Neo Website</title>
+    <link rel="preconnect" href="https://fonts.googleapis.com">
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+    <link href="https://fonts.googleapis.com/css2?family=Source+Code+Pro:ital,wght@0,300;0,400;0,500;0,600;0,700;1,300;1,400;1,500;1,600;1,700&family=Source+Sans+3:ital,wght@0,300;0,400;0,500;0,600;0,700;0,800;1,300;1,400;1,500;1,600;1,700;1,800&family=Source+Serif+4:ital,opsz,wght@0,8..60,400;0,8..60,500;0,8..60,600;0,8..60,700;1,8..60,400;1,8..60,500;1,8..60,600;1,8..60,700&display=swap" rel="stylesheet">
+<body>
+    <script src="../../src/MicroLoader.mjs" type="module"></script>
+</body>
+</html>

package/apps/newwebsite/neo-config.json ADDED Viewed

@@ -0,0 +1,7 @@
+{
+    "appPath"    : "apps/newwebsite/app.mjs",
+    "basePath"   : "../../",
+    "environment": "development",
+    "mainPath"   : "./Main.mjs",
+    "themes"     : ["neo-theme-neo-light"]
+}

package/apps/newwebsite/view/MainContainer.mjs ADDED Viewed

@@ -0,0 +1,59 @@
+import Button    from '../../../src/button/Base.mjs';
+import Container from '../../../src/container/Base.mjs';
+import Viewport  from '../../../src/container/Viewport.mjs';
+/**
+ * @class NewWebsite.view.MainContainer
+ * @extends Neo.container.Viewport
+ */
+class MainContainer extends Viewport {
+    static config = {
+        /**
+         * @member {String} className='NewWebsite.view.MainContainer'
+         * @protected
+         */
+        className: 'NewWebsite.view.MainContainer',
+        /**
+         * @member {String[]} cls=['newwebsite-main-container']
+         */
+        cls: ['newwebsite-main-container'],
+        /**
+         * @member {Object[]} items
+         */
+        items: [{
+            module: Container,
+            cls   : ['vector'],
+            flex  : 'none'
+        }, {
+            cls : 'neo-h1',
+            flex: 'none',
+            html: 'The High-Performance Web Framework for Next Generation Interfaces'
+        }, {
+            module: Container,
+            cls   : ['button-group'],
+            flex  : 'none',
+            items: [{
+                module : Button,
+                cls    : 'get-started-button',
+                text   : 'Get started',
+                flex   : 'none',
+                tooltip: {
+                    text     : 'Coming soon',
+                    showDelay: 0,
+                    hideDelay: 0
+                }
+            }, {
+                module: Button,
+                flex  : 'none',
+                text  : 'View on GitHub',
+                ui    : 'secondary',
+                url   : 'https://github.com/neomjs/neo'
+            }]
+        }]
+    }
+}
+Neo.applyClassConfig(MainContainer);
+export default MainContainer;