Fix version bump merge

.gitignore

@@ -19,6 +19,7 @@ package-lock.json
 
 # Generated files
 /public/css/*
+!/public/css/theme.css
 /public/js/*
 !/public/js/login.js
 !/public/js/setup.js

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "public/lib/crisp-ui"]
-	path = public/lib/crisp-ui
-	url = https://github.com/Putaitu/crisp-ui.git
 [submodule "public/lib/normalize"]
 	path = public/lib/normalize
 	url = https://github.com/necolas/normalize.css.git

docker/.env

@@ -0,0 +1 @@
+NODE_PORT=8080

docker/docker-compose.yml

@@ -8,7 +8,7 @@ services:
         image: node
         container_name: "hashbrown-cms--node"
         ports:
-            - "8080:8080"
+            - "${NODE_PORT}:${NODE_PORT}"
         depends_on:
             - mongodb
         networks:
@@ -17,6 +17,7 @@ services:
         command: "node /opt/hashbrown-cms/hashbrown.js"
         environment:
             - MONGODB_HOST=mongodb
+            - PORT=${NODE_PORT}
         volumes:
             - "../:/opt/hashbrown-cms"
             - "./remote:/remote"

docker/npm-debug.log

@@ -0,0 +1,46 @@
+0 info it worked if it ends with ok
+1 verbose cli [ '/usr/bin/node', '/usr/bin/npm', 'run', 'watch:docker' ]
+2 info using [email protected]
+3 info using [email protected]
+4 verbose run-script [ 'prewatch:docker', 'watch:docker', 'postwatch:docker' ]
+5 info lifecycle [email protected]~prewatch:docker: [email protected]
+6 silly lifecycle [email protected]~prewatch:docker: no script for prewatch:docker, continuing
+7 info lifecycle [email protected]~watch:docker: [email protected]
+8 verbose lifecycle [email protected]~watch:docker: unsafe-perm in lifecycle true
+9 verbose lifecycle [email protected]~watch:docker: PATH: /usr/share/npm/bin/node-gyp-bin:/var/www/test.putaitu.com/4002-hashbrown-cms/node_modules/.bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin
+10 verbose lifecycle [email protected]~watch:docker: CWD: /var/www/test.putaitu.com/4002-hashbrown-cms
+11 silly lifecycle [email protected]~watch:docker: Args: [ '-c',
+11 silly lifecycle   'cd ./docker && export NODE_PORT=8080 && sudo docker-compose -f docker-compose.yml -f docker-compose.watch.yml up --build -d && sudo docker-compose logs -f node' ]
+12 silly lifecycle [email protected]~watch:docker: Returned: code: 1  signal: null
+13 info lifecycle [email protected]~watch:docker: Failed to exec watch:docker script
+14 verbose stack Error: [email protected] watch:docker: `cd ./docker && export NODE_PORT=8080 && sudo docker-compose -f docker-compose.yml -f docker-compose.watch.yml up --build -d && sudo docker-compose logs -f node`
+14 verbose stack Exit status 1
+14 verbose stack     at EventEmitter.<anonymous> (/usr/share/npm/lib/utils/lifecycle.js:232:16)
+14 verbose stack     at emitTwo (events.js:126:13)
+14 verbose stack     at EventEmitter.emit (events.js:214:7)
+14 verbose stack     at ChildProcess.<anonymous> (/usr/share/npm/lib/utils/spawn.js:24:14)
+14 verbose stack     at emitTwo (events.js:126:13)
+14 verbose stack     at ChildProcess.emit (events.js:214:7)
+14 verbose stack     at maybeClose (internal/child_process.js:925:16)
+14 verbose stack     at Process.ChildProcess._handle.onexit (internal/child_process.js:209:5)
+15 verbose pkgid [email protected]
+16 verbose cwd /var/www/test.putaitu.com/4002-hashbrown-cms/docker
+17 error Linux 4.15.0-55-generic
+18 error argv "/usr/bin/node" "/usr/bin/npm" "run" "watch:docker"
+19 error node v8.10.0
+20 error npm  v3.5.2
+21 error code ELIFECYCLE
+22 error [email protected] watch:docker: `cd ./docker && export NODE_PORT=8080 && sudo docker-compose -f docker-compose.yml -f docker-compose.watch.yml up --build -d && sudo docker-compose logs -f node`
+22 error Exit status 1
+23 error Failed at the [email protected] watch:docker script 'cd ./docker && export NODE_PORT=8080 && sudo docker-compose -f docker-compose.yml -f docker-compose.watch.yml up --build -d && sudo docker-compose logs -f node'.
+23 error Make sure you have the latest version of node.js and npm installed.
+23 error If you do, this is most likely a problem with the hashbrown-cms package,
+23 error not with npm itself.
+23 error Tell the author that this fails on your system:
+23 error     cd ./docker && export NODE_PORT=8080 && sudo docker-compose -f docker-compose.yml -f docker-compose.watch.yml up --build -d && sudo docker-compose logs -f node
+23 error You can get information on how to open an issue for this project with:
+23 error     npm bugs hashbrown-cms
+23 error Or if that isn't available, you can get their info via:
+23 error     npm owner ls hashbrown-cms
+23 error There is likely additional logging output above.
+24 verbose exit [ 1, true ]

package.json

@@ -1,22 +1,24 @@
 {
   "name": "hashbrown-cms",
   "repository": "https://github.com/HashBrownCMS/hashbrown-cms.git",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "description": "A free and open-source headless CMS",
   "main": "hashbrown.js",
   "scripts": {
     "build:frontend": "webpack --progress",
     "watch:frontend": "webpack --watch --watch-poll --progress",
     "start": "npm run build:frontend && node hashbrown.js",
     "watch:nodemon": "nodemon hashbrown.js",
-    "start:docker": "npm run build:frontend && cd ./docker && docker-compose up --build -d",
-    "stop:docker": "cd ./docker && docker-compose down",
-    "watch:docker": "cd ./docker && docker-compose -f docker-compose.yml -f docker-compose.watch.yml up --build -d && docker-compose logs -f node",
+    "start:docker": "npm run build:frontend && cd ./docker && sudo docker-compose up --build -d",
+    "stop:docker": "cd ./docker && sudo docker-compose down",
+    "restart:docker": "cd ./docker && sudo docker-compose restart",
+    "watch:docker": "cd ./docker && sudo docker-compose -f docker-compose.yml -f docker-compose.watch.yml up --build -d && sudo docker-compose logs -f node",
     "update": "git pull && git submodule update --recursive --init && npm install && npm run build:frontend"
   },
   "author": "Putaitu",
   "license": "MIT",
   "dependencies": {
+    "acorn": "^7.0.0",
     "app-module-path": "^2.2.0",
     "body-parser": "^1.18.3",
     "cookie-parser": "^1.4.3",
@@ -26,7 +28,6 @@
     "json-loader": "^0.5.4",
     "mongodb": "^3.1.10",
     "multer": "^1.4.1",
-    "pug": "^2.0.3",
     "sass": "^1.16.0",
     "semver": "^5.6.0",
     "webpack": "^4.28.1",