First of the year! Package updates.

icynet.eu.js

@@ -5,10 +5,8 @@ if (process.argv.indexOf('-d') === -1 && process.argv.indexOf('--development') =
   process.env.NODE_ENV = 'production'
 }
 
-require('babel-core/register')({
+require('@babel/register')({
-  plugins: [
+  plugins: [ '@babel/plugin-transform-modules-commonjs' ]
-    'transform-es2015-modules-commonjs'
-  ]
 })
 
 require(path.join(__dirname, 'server'))

package.json

@@ -30,13 +30,13 @@
   },
   "homepage": "https://icynet.eu",
   "dependencies": {
-    "babel-core": "^6.26.3",
+    "@babel/plugin-transform-modules-commonjs": "^7.8.3",
-    "babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",
+    "@babel/register": "^7.8.3",
     "bcryptjs": "^2.4.3",
-    "bluebird": "^3.7.1",
+    "bluebird": "^3.7.2",
     "body-parser": "^1.19.0",
     "connect-redis": "^3.4.2",
-    "connect-session-knex": "^1.4.0",
+    "connect-session-knex": "^1.5.0",
     "email-templates": "^2.7.1",
     "express": "^4.17.1",
     "express-rate-limit": "^2.14.2",
@@ -46,39 +46,42 @@
     "gm": "^1.23.1",
     "knex": "^0.14.6",
     "multiparty": "^4.2.1",
-    "mysql": "^2.17.1",
+    "mysql": "^2.18.1",
     "nodemailer": "^4.7.0",
     "notp": "^2.0.3",
     "oauth-libre": "^0.9.17",
     "objection": "^0.8.9",
-    "pug": "^2.0.4",
     "redis": "^2.8.0",
     "serve-favicon": "^2.5.0",
     "stylus": "^0.54.7",
     "thirty-two": "^1.0.2",
     "toml": "^2.3.6",
-    "uuid": "^3.3.3",
+    "uuid": "^3.4.0",
-    "vue": "^2.6.10"
+    "vue": "^2.6.11"
   },
   "devDependencies": {
-    "babel-loader": "^7.1.5",
+    "@babel/core": "^7.8.3",
-    "babel-preset-env": "^1.7.0",
+    "@babel/preset-env": "^7.8.3",
-    "bootstrap": "^4.3.1",
+    "babel-loader": "^8.0.6",
-    "concurrently": "^3.6.1",
+    "bootstrap": "^4.4.1",
-    "eslint-plugin-import": "^2.18.2",
+    "concurrently": "^5.1.0",
+    "eslint-plugin-import": "^2.20.0",
     "jquery": "^3.4.1",
     "morgan": "^1.9.1",
     "mustache": "^2.3.2",
-    "popper.js": "^1.16.0",
+    "popper.js": "^1.16.1",
+    "pug": "^2.0.4",
+    "pug-plain-loader": "^1.0.0",
     "standard": "^10.0.3",
-    "uglifyjs-webpack-plugin": "^1.3.0",
+    "terser-webpack-plugin": "^2.3.3",
     "vue-clickaway": "^2.2.2",
-    "vue-loader": "^13.7.3",
+    "vue-loader": "^15.8.3",
     "vue-resource": "^1.5.1",
-    "vue-router": "^3.1.3",
+    "vue-router": "^3.1.5",
-    "vue-template-compiler": "^2.6.10",
+    "vue-template-compiler": "^2.6.11",
     "watch": "^1.0.2",
-    "webpack": "^3.12.0",
+    "webpack": "^4.41.5",
+    "webpack-cli": "^3.3.10",
     "webpack-merge": "^4.2.2"
   },
   "standard": {

server/worker.js

@@ -3,10 +3,8 @@
 const path = require('path')
 const util = require('util')
 
-require('babel-core/register')({
+require('@babel/register')({
-  plugins: [
+  plugins: [ '@babel/plugin-transform-modules-commonjs' ]
-    'transform-es2015-modules-commonjs'
-  ]
 })
 
 process.once('message', (args) => {

src/script/component/User.vue

@@ -11,13 +11,13 @@
     .col-sm.info
       .stamps
         .stamp(title="Used an external login" v-if="!password")
-          i.fas.fa-fw.fa-sign-out
+          i.fas.fa-fw.fa-sign-out-alt
 
         .noactive.stamp(v-if='activated == false' title='Not activated.')
           i.fas.fa-fw.fa-envelope
 
         .totp.stamp(v-if='totp_enabled' title="Two-Factor Authentication Enabled")
-          i.fas.fa-fw.fa-shield
+          i.fas.fa-fw.fa-user-shield
 
         .dropdown-wrapper.stamp(@click="dropdown = !dropdown" v-on-clickaway='away')
           i.fas.fa-fw.fa-ellipsis-v

src/style/main.styl

@@ -373,14 +373,12 @@ span.load
         background-color: #d0d0d0
 
 noscript
-    position: fixed
     display: block
     width: 100%
-    background-color: rgba(255, 95, 95, 0.6)
+    background-color: rgba(255,95,95,0.6)
     color: #fff
     text-shadow: 1px 1px 3px #000
     text-align: center
-    z-index: 100
 
 .last-modified
     font-style: italic

static/image/icynet-icon-analytics.svg

@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 29.898235 29.898235"
+   height="29.898235mm"
+   width="29.898235mm">
+  <defs
+     id="defs2">
+    <marker
+       style="overflow:visible;"
+       id="Arrow1Send"
+       refX="0.0"
+       refY="0.0"
+       orient="auto">
+      <path
+         transform="scale(0.2) rotate(180) translate(6,0)"
+         style="fill-rule:evenodd;stroke:#03a9f4;stroke-width:1pt;stroke-opacity:1;fill:#03a9f4;fill-opacity:1"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         id="path856" />
+    </marker>
+    <marker
+       style="overflow:visible;"
+       id="Arrow1Mend"
+       refX="0.0"
+       refY="0.0"
+       orient="auto">
+      <path
+         transform="scale(0.4) rotate(180) translate(10,0)"
+         style="fill-rule:evenodd;stroke:#03a9f4;stroke-width:1pt;stroke-opacity:1;fill:#03a9f4;fill-opacity:1"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         id="path850" />
+    </marker>
+    <marker
+       style="overflow:visible;"
+       id="Arrow1Lend"
+       refX="0.0"
+       refY="0.0"
+       orient="auto">
+      <path
+         transform="scale(0.8) rotate(180) translate(12.5,0)"
+         style="fill-rule:evenodd;stroke:#03a9f4;stroke-width:1pt;stroke-opacity:1;fill:#03a9f4;fill-opacity:1"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         id="path844" />
+    </marker>
+  </defs>
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-1.2029979e-7,-0.00176382)"
+     id="layer1">
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#00a1b5;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;font-variant-east_asian:normal"
+       id="rect1083"
+       width="24.856066"
+       height="24.856066"
+       x="1.5723678"
+       y="3.4147503"
+       transform="rotate(-3.5293181)" />
+    <rect
+       transform="rotate(-8.5307657)"
+       y="4.5749965"
+       x="0.13787289"
+       height="24.856066"
+       width="24.856066"
+       id="rect815"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#00e1fd;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;font-variant-east_asian:normal" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#6fefff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect817"
+       width="24.856066"
+       height="24.856066"
+       x="2.5211489"
+       y="2.5227857"
+       transform="rotate(2.4309033e-4)" />
+    <path
+       clip-path="none"
+       id="path827"
+       d="m 10.375347,9.502362 8.447685,9.454613 4.277499,-12.1369222"
+       style="fill:none;fill-opacity:1;stroke:#03a9f4;stroke-width:1.876;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow1Send)" />
+    <path
+       id="path831"
+       d="M 10.375347,9.502362 6.5886091,23.968708"
+       style="fill:none;fill-opacity:1;stroke:#03a9f4;stroke-width:1.87612462;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <circle
+       r="2.1394424"
+       cy="9.6658792"
+       cx="10.358132"
+       id="path833"
+       style="fill:#03a9f4;fill-opacity:1;stroke:none;stroke-width:0.92037439;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       id="path833-3"
+       d="m 20.970232,18.802922 a 2.1394424,2.1394424 0 0 1 -2.139443,2.139442 2.1394424,2.1394424 0 0 1 -2.139442,-2.139442 2.1394424,2.1394424 0 0 1 2.139442,-2.139443 2.1394424,2.1394424 0 0 1 2.139443,2.139443 z"
+       style="opacity:1;vector-effect:none;fill:#03a9f4;fill-opacity:1;stroke:none;stroke-width:0.92037439;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <circle
+       r="2.1394424"
+       cy="23.691137"
+       cx="6.5025473"
+       id="path833-6"
+       style="fill:#03a9f4;fill-opacity:1;stroke:none;stroke-width:0.92037439;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+</svg>

views/layout.pug

@@ -54,11 +54,10 @@ html
 			block title
 	body
 		noscript
-			h2 This site requires JavaScript to work properly!
+			h2 This site requires JavaScript to work properly! Some features may be limited or missing entirely.
-			p Please consider enabling JavaScript for the full experience.
+			p Please consider enabling JavaScript for the full experience. We respect your browser's privacy settings.
 			if matomo
-				p
+				img.d-inline-block.align-top(src="#{matomo.track_url}piwik.php?idsite=1&rec=1" style="border:0;" alt="")
-					img.d-inline-block.align-top(src="#{matomo.track_url}piwik.php?idsite=1&rec=1" style="border:0;" alt="")
 
 		block nav
 			nav.navbar.navbar-expand-lg.navbar-light.bg-light.sticky-top
@@ -92,7 +91,7 @@ html
 				//FOOTER
 				footer.container.mb-4
 					p
-						|© 2017 - 2019 
+						|© 2017 - 2020 
 						a(href="https://lunasqu.ee" target="_blank" rel="nofollow") Evert Prants
 						span.float-sm-right.ml-4
 							a(href="/docs/terms-of-service") Terms

views/user/login_social.pug

@@ -0,0 +1,34 @@
+extends ../layout.pug
+block title
+	|Icy Network - Log In
+
+block body
+	.container.mb-4.mt-4
+		h1 Log in
+		.row
+			.col-sm-8
+				if message.text
+					if message.error
+						.alert.alert-danger
+							span #{message.text}
+					else
+						.alert.alert-success
+							span #{message.text}
+				form#loginForm(method="POST", action="")
+					input(type="hidden", name="csrf", value=csrf)
+					.form-group
+						label(for="username") Username or Email Address
+						input.form-control(type="text", name="username", id="username")
+					.form-group
+						label(for="password") Password
+						input.form-control(type="password", name="password", id="password")
+					button.btn.btn-primary(type="submit") Log in
+				a(href="/register") Create an account
+				|  · 
+				a(href="/login/reset") Forgot password?
+				if auth && !registrations
+					|  · 
+					a(href="/login/legacy") Social login
+			if auth && registrations
+				aside.col-sm-4
+					include ../includes/external.pug

webpack.common.js

@@ -1,4 +1,5 @@
 const path = require('path')
+const VueLoaderPlugin = require('vue-loader/lib/plugin')
 
 module.exports = {
   entry: {
@@ -23,10 +24,10 @@ module.exports = {
           loader: 'babel-loader',
           options: {
             presets: [
-              'env'
+              '@babel/preset-env'
             ],
             plugins: [
-              'transform-es2015-modules-commonjs'
+              '@babel/plugin-transform-modules-commonjs'
             ]
           }
         }
@@ -37,8 +38,15 @@ module.exports = {
         use: {
           loader: 'vue-loader'
         }
+      },
+      {
+        test: /\.pug$/,
+        exclude: /(node_modules|bower_components)/,
+        loader: 'pug-plain-loader'
       }
     ]
   },
-  plugins: []
+  plugins: [
+    new VueLoaderPlugin()
+  ]
 }

webpack.dev.js

@@ -2,5 +2,6 @@ const merge = require('webpack-merge')
 const common = require('./webpack.common.js')
 
 module.exports = merge(common, {
+  mode: 'development',
   devtool: 'inline-source-map'
 })

webpack.prod.js

@@ -1,13 +1,17 @@
 const webpack = require('webpack')
 const merge = require('webpack-merge')
 const common = require('./webpack.common.js')
-const UglifyJSPlugin = require('uglifyjs-webpack-plugin')
+const TerserPlugin = require('terser-webpack-plugin')
 
 module.exports = merge(common, {
+  mode: 'production',
   plugins: [
     new webpack.DefinePlugin({
       'process.env.NODE_ENV': JSON.stringify('production')
-    }),
+    })
-    new UglifyJSPlugin()
+  ],
-  ]
+  optimization: {
+    minimize: true,
+    minimizer: [ new TerserPlugin() ]
+  }
 })