fix: package.json & package-lock.json to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-BODYPARSER-7926860
- https://snyk.io/vuln/SNYK-JS-EXPRESS-7926867
- https://snyk.io/vuln/SNYK-JS-SEND-7926862
- https://snyk.io/vuln/SNYK-JS-SERVESTATIC-7926865

.editorconfig

@@ -0,0 +1,15 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = false
+insert_final_newline = false
+
+[pug.ts]
+indent_size = 4

.eslintrc.json

@@ -0,0 +1,3 @@
+{
+  "extends": ["prettier"]
+}

.gitignore

@@ -198,4 +198,8 @@ notes
 
 .secrets
 
-public/stylesheets/style.css
+public/stylesheets/style.css
+ngrok
+.dccache
+
+.DS_store

.husky/.gitignore

@@ -0,0 +1 @@
+_

.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npx lint-staged

.prettierrc.json

@@ -0,0 +1,8 @@
+{
+  "trailingComma": "es5",
+  "semi": true,
+  "tabWidth": 2,
+  "singleQuote": true,
+  "jsxSingleQuote": true,
+  "plugins": ["prettier-plugin-tailwindcss", "@prettier/plugin-pug"]
+}

Dockerfile

@@ -1,11 +1,13 @@
-FROM node:10.19.0
+FROM node:21-bullseye-slim
 
 ENV IS_DOCKER=true
 ENV NODE_ENV=production
 
 WORKDIR /app
 COPY ["package.json", "package-lock.json*", "./"]
-RUN npm install && npm install nodemon
+RUN npm install
+RUN npm install nodemon
 COPY . .
+RUN npm run build-tailwind
 
 CMD [ "npm", "start" ]

README.md

@@ -1,5 +1,5 @@
 # pastel.codes
 
-My portfolio website written in node.js, pug and sass
+My portfolio website written in node.js, pug and tailwind
 
 Docker image: https://hub.docker.com/r/auroradot/pastel.codes

app.js

@@ -4,7 +4,7 @@ var path = require('path');
 var cookieParser = require('cookie-parser');
 var mLogger = require('morgan');
 var logger = require('./config/winston');
-const helmet = require("helmet");
+const helmet = require('helmet');
 
 var indexRouter = require('./routes/index');
 var aboutRouter = require('./routes/about');
@@ -12,7 +12,8 @@ var contactRouter = require('./routes/contact');
 
 var app = express();
 
-if (process.env.IS_DOCKER != 'true') app.set('trust proxy', 'loopback,uniquelocal');
+if (process.env.IS_DOCKER != 'true')
+  app.set('trust proxy', 'loopback,uniquelocal');
 app.disable('x-powered-by');
 
 // view engine setup
@@ -20,50 +21,72 @@ app.set('views', path.join(__dirname, 'views'));
 app.set('view engine', 'pug');
 
 if (process.env.NODE_ENV === 'production') {
-    app.use(mLogger("common", { "stream": logger.stream }));
+  app.use(mLogger('common', { stream: logger.stream }));
 } else {
-    app.use(mLogger('dev'));
+  app.use(mLogger('dev'));
 }
 
 app.use(helmet());
 app.use(
-    helmet.contentSecurityPolicy({
+  helmet.contentSecurityPolicy({
-      directives: {
+    directives: {
-        defaultSrc: ["'self'"],
+      defaultSrc: ["'self'"],
-        scriptSrc: ["'self'", "'unsafe-inline'", "'unsafe-eval'", "https://hcaptcha.com", "https://*.hcaptcha.com", "https://cdn.ravenjs.com/"],
+      scriptSrc: [
-        imgSrc: ["'self'", "https://blog.pastel.codes", "https://static.ghost.org", "https://secure.gravatar.com"],
+        "'self'",
-        styleSrc: ["'self'", "'unsafe-inline'", "https://hcaptcha.com", "https://*.hcaptcha.com"],
+        "'unsafe-inline'",
-        fontSrc: ["'self'", "data:"],
+        "'unsafe-eval'",
-        frameSrc: ["https://hcaptcha.com", "https://*.hcaptcha.com"],
+        'https://hcaptcha.com',
-        objectSrc: ["'none'"],
+        'https://*.hcaptcha.com',
-        upgradeInsecureRequests: [],
+        'https://cdn.ravenjs.com/',
-      },
+        'https://cdnjs.cloudflare.com/',
-    })
+        'https://cdn.jsdelivr.net/',
-  );
+        'https://*.cloudfront.net/',
+      ],
+      imgSrc: [
+        "'self'",
+        'https://blog.pastel.codes',
+        'https://static.ghost.org',
+        'https://secure.gravatar.com',
+        'data: ',
+      ],
+      styleSrc: [
+        "'self'",
+        "'unsafe-inline'",
+        'https://hcaptcha.com',
+        'https://*.hcaptcha.com',
+      ],
+      fontSrc: ["'self'", 'data:'],
+      frameSrc: ['https://hcaptcha.com', 'https://*.hcaptcha.com'],
+      objectSrc: ["'none'"],
+      upgradeInsecureRequests: [],
+    },
+  })
+);
 
 app.use(express.json());
 app.use(express.urlencoded({ extended: false }));
 app.use(cookieParser());
 app.use(express.static(path.join(__dirname, 'public')));
+app.use('/obsidian', express.static(path.join(__dirname, 'obsidian')));
 
 app.use('/', indexRouter);
 app.use('/about', aboutRouter);
 app.use('/contact', contactRouter);
 
 // catch 404 and forward to error handler
-app.use(function(req, res, next) {
+app.use(function (req, res, next) {
-    next(createError(404));
+  next(createError(404));
 });
 
 // error handler
-app.use(function(err, req, res, next) {
+app.use(function (err, req, res, _next) {
-    // set locals, only providing error in development
+  // set locals, only providing error in development
-    res.locals.message = err.message;
+  res.locals.message = err.message;
-    res.locals.error = req.app.get('env') === 'development' ? err : {};
+  res.locals.error = req.app.get('env') === 'development' ? err : {};
 
-    // render the error page
+  // render the error page
-    res.status(err.status || 500);
+  res.status(err.status || 500);
-    res.render('error', { title: 'Error', description: "Error" });
+  res.render('error', { title: 'Error', description: 'Error' });
 });
 
 module.exports = app;

bin/www

@@ -35,19 +35,19 @@ server.on('listening', onListening);
  */
 
 function normalizePort(val) {
-    var port = parseInt(val, 10);
+  var port = parseInt(val, 10);
 
-    if (isNaN(port)) {
+  if (isNaN(port)) {
-        // named pipe
+    // named pipe
-        return val;
+    return val;
-    }
+  }
 
-    if (port >= 0) {
+  if (port >= 0) {
-        // port number
+    // port number
-        return port;
+    return port;
-    }
+  }
 
-    return false;
+  return false;
 }
 
 /**
@@ -55,27 +55,25 @@ function normalizePort(val) {
  */
 
 function onError(error) {
-    if (error.syscall !== 'listen') {
+  if (error.syscall !== 'listen') {
-        throw error;
+    throw error;
-    }
+  }
 
-    var bind = typeof port === 'string'
+  var bind = typeof port === 'string' ? 'Pipe ' + port : 'Port ' + port;
-        ? 'Pipe ' + port
-        : 'Port ' + port;
 
-    // handle specific listen errors with friendly messages
+  // handle specific listen errors with friendly messages
-    switch (error.code) {
+  switch (error.code) {
-        case 'EACCES':
+    case 'EACCES':
-            console.error(bind + ' requires elevated privileges');
+      console.error(bind + ' requires elevated privileges');
-            process.exit(1);
+      process.exit(1);
-            break;
+      break;
-        case 'EADDRINUSE':
+    case 'EADDRINUSE':
-            console.error(bind + ' is already in use');
+      console.error(bind + ' is already in use');
-            process.exit(1);
+      process.exit(1);
-            break;
+      break;
-        default:
+    default:
-            throw error;
+      throw error;
-    }
+  }
 }
 
 /**
@@ -83,9 +81,7 @@ function onError(error) {
  */
 
 function onListening() {
-    var addr = server.address();
+  var addr = server.address();
-    var bind = typeof addr === 'string'
+  var bind = typeof addr === 'string' ? 'pipe ' + addr : 'port ' + addr.port;
-        ? 'pipe ' + addr
+  debug('Listening on ' + bind);
-        : 'port ' + addr.port;
-    debug('Listening on ' + bind);
 }

config/winston.js

@@ -2,29 +2,29 @@ var winston = require('winston');
 var appRoot = require('app-root-path');
 
 var logger = new winston.createLogger({
-    transports: [
+  transports: [
-        new winston.transports.File({
+    new winston.transports.File({
-            level: 'info',
+      level: 'info',
-            filename: `${appRoot}/logs/app.log`,
+      filename: `${appRoot}/logs/app.log`,
-            handleExceptions: true,
+      handleExceptions: true,
-            json: true,
+      json: true,
-            maxsize: 5242880, //5MB
+      maxsize: 5242880, //5MB
-            maxFiles: 5,
+      maxFiles: 5,
-            colorize: false
+      colorize: false,
-        }),
+    }),
-        new winston.transports.Console({
+    new winston.transports.Console({
-            level: 'debug',
+      level: 'debug',
-            handleExceptions: true,
+      handleExceptions: true,
-            json: false,
+      json: false,
-            colorize: true
+      colorize: true,
-        })
+    }),
-    ],
+  ],
-    exitOnError: false
+  exitOnError: false,
 });
 
 logger.stream = {
-    write: function(message, encoding){
+  write: function (message, _encoding) {
-        logger.info(message);
+    logger.info(message);
-    }
+  },
 };
-module.exports = logger
+module.exports = logger;

eslint.config.mjs

@@ -0,0 +1,20 @@
+import globals from 'globals';
+import pluginJs from '@eslint/js';
+
+export default [
+  { files: ['**/*.js'], languageOptions: { sourceType: 'commonjs' } },
+  { languageOptions: { globals: { ...globals.browser, ...globals.node } } },
+  pluginJs.configs.recommended,
+  {
+    rules: {
+      'no-unused-vars': [
+        'error',
+        {
+          argsIgnorePattern: '^_',
+          varsIgnorePattern: '^_',
+          caughtErrorsIgnorePattern: '^_',
+        },
+      ],
+    },
+  },
+];