site port now configurable, removed kit from frame, fixed nav sort

brain/data/Settings.js

@@ -21,6 +21,7 @@ export default class Settings {
 					let payload = req.body;
 					//so payload matches loaded config
 					payload.global.display_limit = result.settings.global.display_limit;
+					payload.global.port = result.settings.global.port;
 					payload.global.last_backup = result.settings.global.last_backup;
 					let user = req.session.user;
 					let found = _.find(result.folks, { id: user.id });

brain/views/frame.pug

@@ -29,7 +29,7 @@ html(xmlns='http://www.w3.org/1999/xhtml', lang='en', xml:lang="en")
                   -if(status)
                     include partials/dash-nav
           block main-content
-      script(src='/assets/scripts/dashkit.min.js' type="text/javascript")
+      //script(src='/assets/scripts/dashkit.min.js' type="text/javascript")
       script(src='/assets/scripts/dash.min.js' type="text/javascript")
               
           

init.js

@@ -7,12 +7,13 @@
 var app = require('./brain/app');
 var debug = require('debug')('fipamo:server');
 var http = require('http');
+var config = require('./site/settings.json');
 
 /**
  * Get port from environment and store in Express.
  */
 
-var port = normalizePort(process.env.PORT || '2314');
+var port = normalizePort(process.env.PORT || config.global.port);
 app.set('port', port);
 
 /**

package-lock.json

@@ -2522,11 +2522,6 @@
       "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz",
       "integrity": "sha512-bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw=="
     },
-    "browser-split": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/browser-split/-/browser-split-0.0.0.tgz",
-      "integrity": "sha1-QUGcrvdpdVkp3VGJZ9PuwKYmJ3E="
-    },
     "browserify-aes": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
@@ -2883,14 +2878,6 @@
         "safe-buffer": "^5.0.1"
       }
     },
-    "class-list": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/class-list/-/class-list-0.1.1.tgz",
-      "integrity": "sha1-m5dFGSxBebXaCg12M2WOPHDXlss=",
-      "requires": {
-        "indexof": "0.0.1"
-      }
-    },
     "class-utils": {
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
@@ -5241,15 +5228,6 @@
         }
       }
     },
-    "hyperscript": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/hyperscript/-/hyperscript-1.0.7.tgz",
-      "integrity": "sha1-2I7TxRk0xtb6NbKr/XwA8QCCD2U=",
-      "requires": {
-        "browser-split": "0.0.0",
-        "class-list": "~0.1.0"
-      }
-    },
     "iconv-lite": {
       "version": "0.4.23",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
@@ -5299,11 +5277,6 @@
       "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
       "dev": true
     },
-    "indexof": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
-      "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10="
-    },
     "inflection": {
       "version": "1.12.0",
       "resolved": "https://registry.npmjs.org/inflection/-/inflection-1.12.0.tgz",
@@ -5635,11 +5608,6 @@
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
       "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
     },
-    "jquery-browserify": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/jquery-browserify/-/jquery-browserify-1.8.1.tgz",
-      "integrity": "sha1-DeqddBpPQRWuGYDEUxsiUCmRoBU="
-    },
     "js-stringify": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.2.tgz",
@@ -5897,9 +5865,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.15",
+      "version": "4.17.19",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
+      "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ=="
     },
     "lodash.clone": {
       "version": "4.5.0",
@@ -6715,11 +6683,6 @@
         "has": "^1.0.3"
       }
     },
-    "observable": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/observable/-/observable-1.3.1.tgz",
-      "integrity": "sha1-PSogOxQw2vak1tNvI2zBPm7Vu04="
-    },
     "on-finished": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
@@ -8760,16 +8723,6 @@
         "socks": "~2.2.0"
       }
     },
-    "sortable": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/sortable/-/sortable-2.0.0.tgz",
-      "integrity": "sha1-NLNUK0KQTFm4RU9VFIoPT2AYaUM=",
-      "requires": {
-        "hyperscript": "~1.0.1",
-        "jquery-browserify": "~1.8.1",
-        "observable": "~1.3.1"
-      }
-    },
     "sortablejs": {
       "version": "1.10.2",
       "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.10.2.tgz",

package.json

@@ -1,6 +1,6 @@
 {
-    "name": "fipamo",
+    "name": "fipamo-development",
-    "version": "0.0.1",
+    "version": "1.1.0",
     "private": true,
     "description": "The most chill blog framework ever.",
     "repository": "https://code.playvicio.us/Are0h/Fipamo",
@@ -11,8 +11,7 @@
         "dev": "nodemon -r esm init.js --ignore node_modules/ -e js",
         "debug": "nodemon inspect -r esm init.js --ignore node_modules/ -e js",
         "prettier-watch": "npx onchange '**/*.js' -- npx prettier --write {{changed}}",
-        "watch": "stylus -w -o public/assets/css src/styles/dash.styl & parcel watch src/com/Start.js --out-dir public/assets/scripts --out-file dash.min.js --public-url /assets/scripts",
+        "watch": "stylus -w -o public/assets/css src/styles/dash.styl & parcel watch src/com/Start.js --out-dir public/assets/scripts --out-file dash.min.js --public-url /assets/scripts"
-        "build-back-kit": "uglifyjs src/libraries/highlight.pack.js node_modules/sortablejs/Sortable.min.js node_modules/scramble-text/dist/ScrambleText.min.js node_modules/reframe.js/dist/reframe.min.js -c -o public/assets/scripts/dashkit.min.js"
     },
     "engines": {
         "node": ">=10.16.0"
@@ -33,7 +32,7 @@
         "highlight.js": "^9.18.1",
         "jsdom": "^12.2.0",
         "jsonwebtoken": "^8.5.1",
-        "lodash": "^4.17.15",
+        "lodash": "^4.17.19",
         "mailgun-js": "^0.18.0",
         "markdown-it": "^8.4.1",
         "markdown-yaml-metadata-parser": "^2.0.5",
@@ -48,7 +47,6 @@
         "request": "^2.88.2",
         "sanitize-html": "^1.26.0",
         "serve-favicon": "latest",
-        "sortable": "^2.0.0",
         "sortablejs": "^1.10.2",
         "tiny-date-picker": "^3.2.8",
         "uuid": "^3.4.0"

site/init/settings-template.json

@@ -8,7 +8,8 @@
         "renderOnSave": "false",
         "theme": "default-light",
         "display_limit": 5,
-        "last_backup": null
+        "last_backup": null,
+        "port": 2314
     },
     "library_stats": {
         "current_index": 1

src/com/controllers/NavIndex.js

@@ -2,6 +2,7 @@ import FipamoAdminAPI from '../../libraries/FipamoAdminAPI';
 import NavActions from '../actions/NavActions';
 import * as DataEvent from '../events/DataEvent';
 import Notifications from '../ui/Notifications';
+import Sortable from 'sortablejs';
 const notify = new Notifications();
 const admin = new FipamoAdminAPI();
 export default class NavIndex {