From dc13a25bfbd52a50b2aae758393e16e90ba02dfc Mon Sep 17 00:00:00 2001 From: Ro Date: Sun, 10 Mar 2019 11:53:20 -0400 Subject: [PATCH] Cleaned up package.json, style and script watchers now one command --- init.js | 1 - package.json | 135 +++++++++++------------ themes/dash/assets/js/dash.min.js | 2 +- themes/dash/src/styles/main/_colors.styl | 2 +- 4 files changed, 69 insertions(+), 71 deletions(-) diff --git a/init.js b/init.js index 80bb8d4..5882b11 100644 --- a/init.js +++ b/init.js @@ -19,7 +19,6 @@ app.set('port', port); /** * Create HTTP server. */ - var server = http.createServer(app); /** diff --git a/package.json b/package.json index 438da83..97d4046 100644 --- a/package.json +++ b/package.json @@ -1,70 +1,69 @@ { - "name": "fipamo", - "version": "0.0.1", - "private": true, - "description": "The most chill blog framework ever.", - "repository": "https://code.playvicio.us/Are0h/Fipamo", - "theme": "default-light", - "scripts": { - "start": "pm2 --node-args='-r esm' start init.js", - "stop": "pm2 stop init.js", - "dev": "nodemon -r esm init.js --ignore node_modules/ -e js", - "watch-front-scripts": "parcel watch themes/$npm_package_theme/src/com/Start.jsx --out-dir themes/$npm_package_theme/assets/js --out-file start.min.js --public-url /$npm_package_theme/assets/js", - "watch-front-styles": "stylus -w -m -o themes/$npm_package_theme/assets/css themes/$npm_package_theme/src/styles/base.styl", - "build-front-kit": "uglifyjs node_modules/scramble-text/dist/ScrambleText.min.js node_modules/animejs/anime.min.js node_modules/reframe.js/dist/reframe.min.js -c -o themes/$npm_package_theme/assets/js/toolkit.min.js", - "watch-back-scripts": "parcel watch themes/dash/src/com/Start.js --out-dir themes/dash/assets/js --out-file dash.min.js --public-url /dash/assets/js", - "watch-back-styles": "stylus -w -m -o themes/dash/assets/css themes/dash/src/styles/dash.styl", - "build-back-kit": "uglifyjs themes/dash/src/libraries/highlight.pack.js node_modules/sortablejs/Sortable.min.js node_modules/scramble-text/dist/ScrambleText.min.js node_modules/animejs/anime.min.js node_modules/reframe.js/dist/reframe.min.js -c -o themes/dash/assets/js/dashkit.min.js" - }, - "engines": { - "node": ">=8.12.0" - }, - "dependencies": { - "bcrypt-nodejs": "latest", - "bluebird": "^3.4.1", - "body-parser": "latest", - "caret-pos": "^1.2.1", - "connect-flash": "latest", - "cookie-parser": "~1.3.3", - "debug": "^4.1.0", - "dexie": "^2.0.4", - "esm": "^3.0.84", - "express": "^4.16.4", - "express-session": "^1.15.6", - "filehound": "^1.16.5", - "fs-extra": "latest", - "highlight.js": "^9.13.1", - "jsdom": "^12.2.0", - "lodash": "^4.17.11", - "mailgun-js": "^0.18.0", - "markdown-it": "^8.4.1", - "memorystore": "^1.6.0", - "morgan": "latest", - "multer": "latest", - "nodemailer": "latest", - "nodemailer-mailgun-transport": "^1.4.0", - "pg": "^7.5.0", - "pg-hstore": "^2.3.2", - "pug": "latest", - "reframe.js": "^2.2.1", - "request": "^2.88.0", - "sanitize-html": "^1.19.1", - "sequelize": "^4.37.6", - "sequelize-cli": "^5.3.0", - "serve-favicon": "latest", - "sortable": "^2.0.0", - "sortablejs": "^1.8.0-rc1", - "tiny-date-picker": "^3.2.6", - "uuid": "^3.2.1" - }, - "devDependencies": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", - "@babel/preset-env": "^7.1.0", - "animejs": "^2.2.0", - "babel-preset-env": "^1.7.0", - "bulma.styl": "^0.6.11", - "scramble-text": "0.0.8", - "stylus": "^0.54.5" - } + "name": "fipamo", + "version": "0.0.1", + "private": true, + "description": "The most chill blog framework ever.", + "repository": "https://code.playvicio.us/Are0h/Fipamo", + "theme": "default-light", + "scripts": { + "start": "pm2 --node-args='-r esm' start init.js", + "stop": "pm2 stop init.js", + "dev": "nodemon -r esm init.js --ignore node_modules/ -e js", + "watch-front-scripts": "parcel watch themes/$npm_package_theme/src/com/Start.jsx --out-dir themes/$npm_package_theme/assets/js --out-file start.min.js --public-url /$npm_package_theme/assets/js", + "watch-front-styles": "stylus -w -m -o themes/$npm_package_theme/assets/css themes/$npm_package_theme/src/styles/base.styl", + "build-front-kit": "uglifyjs node_modules/scramble-text/dist/ScrambleText.min.js node_modules/animejs/anime.min.js node_modules/reframe.js/dist/reframe.min.js -c -o themes/$npm_package_theme/assets/js/toolkit.min.js", + "watch-back": "stylus -w -m -o themes/dash/assets/css themes/dash/src/styles/dash.styl & parcel watch themes/dash/src/com/Start.js --out-dir themes/dash/assets/js --out-file dash.min.js --public-url /dash/assets/js", + "build-back-kit": "uglifyjs themes/dash/src/libraries/highlight.pack.js node_modules/sortablejs/Sortable.min.js node_modules/scramble-text/dist/ScrambleText.min.js node_modules/animejs/anime.min.js node_modules/reframe.js/dist/reframe.min.js -c -o themes/dash/assets/js/dashkit.min.js" + }, + "engines": { + "node": ">=8.12.0" + }, + "dependencies": { + "bcrypt-nodejs": "latest", + "bluebird": "^3.4.1", + "body-parser": "latest", + "caret-pos": "^1.2.1", + "connect-flash": "latest", + "cookie-parser": "~1.3.3", + "debug": "^4.1.0", + "dexie": "^2.0.4", + "esm": "^3.0.84", + "express": "^4.16.4", + "express-session": "^1.15.6", + "filehound": "^1.16.5", + "fs-extra": "latest", + "highlight.js": "^9.13.1", + "jsdom": "^12.2.0", + "lodash": "^4.17.11", + "mailgun-js": "^0.18.0", + "markdown-it": "^8.4.1", + "memorystore": "^1.6.0", + "morgan": "latest", + "multer": "latest", + "nodemailer": "latest", + "nodemailer-mailgun-transport": "^1.4.0", + "pg": "^7.5.0", + "pg-hstore": "^2.3.2", + "pug": "latest", + "reframe.js": "^2.2.1", + "request": "^2.88.0", + "sanitize-html": "^1.19.1", + "sequelize": "^4.37.6", + "sequelize-cli": "^5.3.0", + "serve-favicon": "latest", + "sortable": "^2.0.0", + "sortablejs": "^1.8.0-rc1", + "tiny-date-picker": "^3.2.6", + "uuid": "^3.2.1" + }, + "devDependencies": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "@babel/preset-env": "^7.1.0", + "animejs": "^2.2.0", + "babel-preset-env": "^1.7.0", + "bulma.styl": "^0.6.11", + "scramble-text": "0.0.8", + "stylus": "^0.54.5" + } } diff --git a/themes/dash/assets/js/dash.min.js b/themes/dash/assets/js/dash.min.js index 6f5be8d..b8bf510 100644 --- a/themes/dash/assets/js/dash.min.js +++ b/themes/dash/assets/js/dash.min.js @@ -9020,7 +9020,7 @@ var parent = module.bundle.parent; if ((!parent || !parent.isParcelRequire) && typeof WebSocket !== 'undefined') { var hostname = "" || location.hostname; var protocol = location.protocol === 'https:' ? 'wss' : 'ws'; - var ws = new WebSocket(protocol + '://' + hostname + ':' + "55275" + '/'); + var ws = new WebSocket(protocol + '://' + hostname + ':' + "54198" + '/'); ws.onmessage = function (event) { var data = JSON.parse(event.data); diff --git a/themes/dash/src/styles/main/_colors.styl b/themes/dash/src/styles/main/_colors.styl index 43d05e1..89b678c 100644 --- a/themes/dash/src/styles/main/_colors.styl +++ b/themes/dash/src/styles/main/_colors.styl @@ -1,5 +1,5 @@ $primary = #374857; -//$primary = #200317; deep purple +//$primary = #200317; deep sexy purple $secondary = #b2cce5; $tertiary = #f5ab35; $highlight = #fc6399;