Merge 5a5cf6074c into dec522c914

Rename prepare step

Attempt docker fix

Docker fix

Fix bio and add pug prettier config

Fix spacing

Fix grammer

.gitignore

@@ -201,3 +201,5 @@ notes
 public/stylesheets/style.css
 ngrok
 .dccache
+
+.DS_store

.prettierrc.json

@@ -4,5 +4,5 @@
   "tabWidth": 2,
   "singleQuote": true,
   "jsxSingleQuote": true,
-  "plugins": ["prettier-plugin-tailwindcss"]
+  "plugins": ["prettier-plugin-tailwindcss", "@prettier/plugin-pug"]
 }

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:16-bullseye-slim
+FROM node:21-bullseye-slim
 
 ENV IS_DOCKER=true
 ENV NODE_ENV=production

app.js

@@ -38,12 +38,16 @@ app.use(
         'https://hcaptcha.com',
         'https://*.hcaptcha.com',
         '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'",
@@ -63,6 +67,7 @@ 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);