Merge pull request #362 from neomjs/dev

v1.0.61

Author: tobiu

apps/covid/model/Country.mjs

@@ -9,26 +9,35 @@ class Country extends Model {
         className: 'Covid.model.Country',
 
         fields: [{
+            name: 'active',
+            type: 'Integer'
+        }, {
             name: 'cases',
-            type: 'int'
+            type: 'Integer'
+        }, {
+            name: 'casesPerOneMillion',
+            type: 'Integer'
         }, {
             name: 'country',
-            type: 'string'
+            type: 'String'
+        }, {
+            name: 'countryInfo',
+            type: 'Object' // _id, flag, iso2, iso3, lat, long
         }, {
             name: 'critical',
-            type: 'int'
+            type: 'Integer'
         }, {
             name: 'deaths',
-            type: 'int'
+            type: 'Integer'
         }, {
             name: 'recovered',
-            type: 'int'
+            type: 'Integer'
         }, {
             name: 'todayCases',
-            type: 'int'
+            type: 'Integer'
         }, {
             name: 'todayDeaths',
-            type: 'int'
+            type: 'Integer'
         }]
     }}
 }

apps/covid/view/FooterContainer.mjs

@@ -0,0 +1,64 @@
+import {default as Container}   from '../../../src/container/Base.mjs';
+
+/**
+ * @class Covid.view.FooterContainer
+ * @extends Neo.container.Base
+ */
+class FooterContainer extends Container {
+    static getConfig() {return {
+        /**
+         * @member {String} className='Covid.view.FooterContainer'
+         * @private
+         */
+        className: 'Covid.view.FooterContainer',
+        /**
+         * @member {Number} height=20
+         */
+        height: 25,
+        /**
+         * @member {Object} layout={ntype: 'hbox', align: 'stretch'}
+         */
+        layout: {ntype: 'hbox'},
+        /**
+         * @member {String} reference='footer'
+         */
+        reference: 'footer',
+        /**
+         * @member {Object} style={overflow: 'visible'}
+         */
+        style: {overflow: 'visible'},
+        /**
+         * @member {Object} itemDefaults
+         */
+        itemDefaults: {
+            ntype: 'component',
+            cls  : ['neo-link-color'],
+            style: {fontSize: '13px', padding: '10px', paddingTop: 0}
+        },
+        /**
+         * @member {Array} items
+         */
+        items: [{
+            html : 'App created with <a target="_blank" href="https://github.com/neomjs/neo">neo.mjs</a>.'
+        }, {
+            flex: 1
+        }, {
+            html : 'Data provided by <a target="_blank" href="https://github.com/NovelCOVID/API">NovelCOVID/API</a>.'
+        }, {
+            flex: 1
+        }, {
+            html : 'Country Flag Icons made by <a target="_blank" href="https://www.flaticon.com/authors/freepik" title="Freepik">Freepik</a> from <a target="_blank" href="https://www.flaticon.com/" title="Flaticon"> www.flaticon.com</a>.'
+        }, {
+            ntype  : 'button',
+            cls    : ['neo-button'],
+            handler: 'onRemoveFooterButtonClick',
+            height : 24,
+            style  : {margin: 0, marginRight: '10px', marginTop: '-5px'},
+            text   : 'Remove Footer'
+        }]
+    }}
+}
+
+Neo.applyClassConfig(FooterContainer);
+
+export {FooterContainer as default};

apps/covid/view/GalleryContainer.mjs

@@ -190,14 +190,6 @@ class GalleryContainer extends Container {
                     '<b>Navigation Concept</b>',
                     '<p>You can use the Arrow Keys to walk through the items.</p>'
                 ].join('')
-            }, {
-                module: BoxLabel,
-                text  : [
-                    '<b>Attribution</b>',
-                    '<p>App created with <a href="https://github.com/neomjs/neo">neo.mjs</a>.</p>',
-                    '<p>Data provided by <a href="https://github.com/NovelCOVID/API">NovelCOVID/API</a>.</p>',
-                    '<p>Icons made by <a href="https://www.flaticon.com/authors/freepik" title="Freepik">Freepik</a> from <a href="https://www.flaticon.com/" title="Flaticon"> www.flaticon.com</a>.</p>'
-                ].join('')
             }]
         }]
     }}

apps/covid/view/HeaderContainer.mjs

@@ -31,16 +31,19 @@ class HeaderContainer extends Container {
          * @member {Array} items
          */
         items: [{
-            html : 'COVID-19 neo.mjs App',
-            style: {padding: '20px'},
-            width: 210
+            cls     : ['neo-link-color'],
+            html    : 'COVID-19 neo.mjs App',
+            minWidth: 140,
+            style   : {padding: '20px'},
+            width   : 210
         }, {
             module       : SelectField,
             displayField : 'country',
             flex         : 'none',
             height       : 25,
             labelPosition: 'inline',
             labelText    : 'Select a Country',
+            minWidth     : 140,
             reference    : 'country-field',
             style        : {marginTop: '15px'},
             width        : 200,
@@ -83,8 +86,8 @@ class HeaderContainer extends Container {
                 tag: 'table',
                 cn : [
                     {tag: 'tr', cn : [{tag: 'td', html: 'Cases'},     {tag: 'td', cls: ['neo-align-right']}]},
-                    {tag: 'tr', cn : [{tag: 'td', html: 'Deaths'},    {tag: 'td', cls: ['neo-align-right', 'neo-content-deaths']}]},
-                    {tag: 'tr', cn : [{tag: 'td', html: 'Recovered'}, {tag: 'td', cls: ['neo-align-right', 'neo-content-recovered']}]}
+                    {tag: 'tr', cn : [{tag: 'td', html: 'Recovered'}, {tag: 'td', cls: ['neo-align-right', 'neo-content-recovered']}]},
+                    {tag: 'tr', cn : [{tag: 'td', html: 'Deaths'},    {tag: 'td', cls: ['neo-align-right', 'neo-content-deaths']}]}
                 ]
             }
         }, {

apps/covid/view/HelixContainer.mjs

@@ -236,14 +236,6 @@ class HelixContainer extends Container {
                     '<p>Hit the Space Key to rotate the currently selected item to the front.</p>',
                     '<p>Hit the Enter Key to expand the currently selected item.</p>'
                 ].join('')
-            }, {
-                module: BoxLabel,
-                text  : [
-                    '<b>Attribution</b>',
-                    '<p>App created with <a href="https://github.com/neomjs/neo">neo.mjs</a>.</p>',
-                    '<p>Data provided by <a href="https://github.com/NovelCOVID/API">NovelCOVID/API</a>.</p>',
-                    '<p>Icons made by <a href="https://www.flaticon.com/authors/freepik" title="Freepik">Freepik</a> from <a href="https://www.flaticon.com/" title="Flaticon"> www.flaticon.com</a>.</p>'
-                ].join('')
             }]
         }]
     }}

apps/covid/view/MainContainer.mjs

@@ -1,3 +1,4 @@
+import FooterContainer           from './FooterContainer.mjs';
 import GalleryContainer          from './GalleryContainer.mjs';
 import HeaderContainer           from './HeaderContainer.mjs';
 import HelixContainer            from './HelixContainer.mjs';
@@ -47,7 +48,7 @@ class MainContainer extends Viewport {
             activeIndex: this.controller.getTabIndex(Neo.config.hash),
             flex       : 1,
             reference  : 'tab-container',
-            style      : {margin: '10px'},
+            style      : {margin: '10px', marginBottom: '10px'},
 
             items: [{
                 module         : TableContainer,
@@ -72,7 +73,7 @@ class MainContainer extends Viewport {
                     text   : 'Helix'
                 }
             }]
-        }];
+        }, FooterContainer];
     }
 }
 

apps/covid/view/MainContainerController.mjs

@@ -90,8 +90,8 @@ class MainContainerController extends ComponentController {
             vdom         = summaryTable.vdom;
 
         vdom.cn[0].cn[1].html = data.cases;
-        vdom.cn[1].cn[1].html = data.deaths;
-        vdom.cn[2].cn[1].html = data.recovered;
+        vdom.cn[1].cn[1].html = data.recovered;
+        vdom.cn[2].cn[1].html = data.deaths;
 
         summaryTable.vdom = vdom;
     }
@@ -278,6 +278,13 @@ class MainContainerController extends ComponentController {
         me.loadSummaryData();
     }
 
+    /**
+     * @param {Object} data
+     */
+    onRemoveFooterButtonClick(data) {
+        this.view.remove(this.getReference('footer'), true);
+    }
+
     /**
      * @param {Object} data
      */

apps/covid/view/TableContainer.mjs

@@ -23,6 +23,11 @@ class TableContainer extends Container {
          * @member {Neo.controller.Component|null} controller=TableContainerController
          */
         controller: TableContainerController,
+        /**
+         * @member {Number} historyPanelWidth=420
+         * @private
+         */
+        historyPanelWidth: 420,
         /**
          * @member {Neo.table.Container|null} table=null
          */
@@ -49,7 +54,7 @@ class TableContainer extends Container {
             layout   : {ntype: 'vbox', align: 'stretch'},
             reference: 'controls-panel',
             style    : {backgroundColor: '#2b2b2b'},
-            width    : 410,
+            width    : '@config:historyPanelWidth',
 
             containerConfig: {
                 flex : null,

apps/covid/view/TableContainerController.mjs

@@ -109,7 +109,7 @@ class TableContainerController extends ComponentController {
         const panel  = this.getReference('controls-panel'),
               expand = panel.width === 40;
 
-        panel.width = expand ? 410 : 40;
+        panel.width = expand ? this.view.historyPanelWidth : 40;
 
         data.component.text = expand ? 'X' : '+';
     }

apps/covid/view/country/Gallery.mjs

@@ -166,7 +166,7 @@ class CountryGallery extends Gallery {
         setTimeout(() => {
             this.selectOnMount = true;
             this.onMounted();
-        }, Neo.config.environment === 'development' ? 200 : 500);
+        }, 200);
     }
 }