Compare commits

...

6 Commits

Author SHA1 Message Date
snyk-bot
74559a72b6 fix: package.json & package-lock.json to reduce vulnerabilities
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-NODEMAILER-13378253
2025-10-13 04:41:59 +00:00
E
f3525636c1 Edit about, change name and remove dead links 2025-09-14 14:16:38 +01:00
E
dec522c914 Fix Docker and bio
Rename prepare step

Attempt docker fix

Docker fix

Fix bio and add pug prettier config

Fix spacing

Fix grammer
2024-04-29 17:21:32 +01:00
E
b3aae82a2a Merge branch 'fix-docker-image' 2024-04-29 15:30:43 +01:00
E
140fa8fea0 Omit dev dependencies 2024-04-29 15:30:13 +01:00
E
eba987561e Merge branch 'add-obsidian-graph' 2024-04-29 15:26:45 +01:00
7 changed files with 131 additions and 88 deletions

View File

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

View File

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

51
package-lock.json generated
View File

@@ -19,7 +19,7 @@
"helmet": "^4.6.0",
"http-errors": "^1.8.0",
"morgan": "^1.10.0",
"nodemailer": "^6.6.1",
"nodemailer": "^7.0.7",
"npm-watch": "^0.11.0",
"postcss-cli": "^8.3.1",
"pug": "^3.0.2",
@@ -29,6 +29,7 @@
},
"devDependencies": {
"@eslint/js": "^9.1.1",
"@prettier/plugin-pug": "^3.0.0",
"eslint": "^9.1.1",
"eslint-config-prettier": "^9.1.0",
"globals": "^15.1.0",
@@ -347,6 +348,32 @@
"node": ">= 8"
}
},
"node_modules/@prettier/plugin-pug": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/@prettier/plugin-pug/-/plugin-pug-3.0.0.tgz",
"integrity": "sha512-ERMMvGSJK/7CTc8OT7W/dtlV43sytyNeiCWckN0DIFepqwXotU0+coKMv5Wx6IWSNj7ZSjdNGBAA1nMPi388xw==",
"dev": true,
"funding": [
{
"type": "github",
"url": "https://github.com/Shinigami92"
},
{
"type": "paypal",
"url": "https://www.paypal.com/donate/?hosted_button_id=L7GY729FBKTZY"
}
],
"dependencies": {
"pug-lexer": "^5.0.1"
},
"engines": {
"node": "^16.13.0 || >=18.0.0",
"npm": ">=7.10.0"
},
"peerDependencies": {
"prettier": "^3.0.0"
}
},
"node_modules/@sendgrid/client": {
"version": "8.1.3",
"resolved": "https://registry.npmjs.org/@sendgrid/client/-/client-8.1.3.tgz",
@@ -3225,9 +3252,10 @@
"integrity": "sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw=="
},
"node_modules/nodemailer": {
"version": "6.9.13",
"resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.13.tgz",
"integrity": "sha512-7o38Yogx6krdoBf3jCAqnIN4oSQFx+fMa0I7dK1D+me9kBxx12D+/33wSb+fhOCtIxvYJ+4x4IMEhmhCKfAiOA==",
"version": "7.0.7",
"resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-7.0.7.tgz",
"integrity": "sha512-jGOaRznodf62TVzdyhKt/f1Q/c3kYynk8629sgJHpRzGZj01ezbgMMWJSAjHADcwTKxco3B68/R+KHJY2T5BaA==",
"license": "MIT-0",
"engines": {
"node": ">=6.0.0"
}
@@ -5309,6 +5337,15 @@
"fastq": "^1.6.0"
}
},
"@prettier/plugin-pug": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/@prettier/plugin-pug/-/plugin-pug-3.0.0.tgz",
"integrity": "sha512-ERMMvGSJK/7CTc8OT7W/dtlV43sytyNeiCWckN0DIFepqwXotU0+coKMv5Wx6IWSNj7ZSjdNGBAA1nMPi388xw==",
"dev": true,
"requires": {
"pug-lexer": "^5.0.1"
}
},
"@sendgrid/client": {
"version": "8.1.3",
"resolved": "https://registry.npmjs.org/@sendgrid/client/-/client-8.1.3.tgz",
@@ -7418,9 +7455,9 @@
"integrity": "sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw=="
},
"nodemailer": {
"version": "6.9.13",
"resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.13.tgz",
"integrity": "sha512-7o38Yogx6krdoBf3jCAqnIN4oSQFx+fMa0I7dK1D+me9kBxx12D+/33wSb+fhOCtIxvYJ+4x4IMEhmhCKfAiOA=="
"version": "7.0.7",
"resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-7.0.7.tgz",
"integrity": "sha512-jGOaRznodf62TVzdyhKt/f1Q/c3kYynk8629sgJHpRzGZj01ezbgMMWJSAjHADcwTKxco3B68/R+KHJY2T5BaA=="
},
"nodemon": {
"version": "2.0.22",

View File

@@ -13,12 +13,12 @@
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
"dev": "npx nodemon ./bin/www -e js,pug,sass",
"start": "npx ./bin/www -e js,pug,sass",
"start": "npx nodemon ./bin/www -e js,pug,sass",
"watch-tailwind": "npx npm-watch",
"build-tailwind": "npx postcss src/tailwind.css -o public/stylesheets/style.css",
"lint": "prettier --check . && eslint .",
"format": "prettier --write --ignore-path .gitignore .",
"prepare": "husky install"
"husky-install": "husky install"
},
"dependencies": {
"@sendgrid/mail": "^8.1.3",
@@ -32,7 +32,7 @@
"helmet": "^4.6.0",
"http-errors": "^1.8.0",
"morgan": "^1.10.0",
"nodemailer": "^6.6.1",
"nodemailer": "^7.0.7",
"npm-watch": "^0.11.0",
"postcss-cli": "^8.3.1",
"pug": "^3.0.2",
@@ -42,6 +42,7 @@
},
"devDependencies": {
"@eslint/js": "^9.1.1",
"@prettier/plugin-pug": "^3.0.0",
"eslint": "^9.1.1",
"eslint-config-prettier": "^9.1.0",
"globals": "^15.1.0",

View File

@@ -1,70 +1,83 @@
extends layout
block nav-links
a(href='/')
li(class="py-3 bg-pink text-black hover:bg-black hover:text-pink transition duration-500 ease-in-out")
span Home
a(href='#')
li(class="py-3 bg-black text-green hover:bg-pink hover:text-black transition duration-500 ease-in-out")
span About
a(href='/obsidian/projects.html')
li(class="py-3 bg-pink text-black hover:bg-black hover:text-pink transition duration-500 ease-in-out")
span Obsidian
a(href='https://github.com/aurora-dot')
li(class="py-3 bg-pink text-black hover:bg-black hover:text-pink transition duration-500 ease-in-out")
span Projects
a(href='https://blog.pastel.codes')
li(class="py-3 bg-pink text-black hover:bg-black hover:text-pink transition duration-500 ease-in-out")
span Blog
a(href='/contact')
li(class="py-3 bg-pink text-black hover:bg-black hover:text-pink transition duration-500 ease-in-out")
span Contact
a(href='/')
li.py-3.bg-pink.text-black.transition.duration-500.ease-in-out(
class='hover:bg-black hover:text-pink'
)
span Home
a(href='#')
li.py-3.bg-black.text-green.transition.duration-500.ease-in-out(
class='hover:bg-pink hover:text-black'
)
span About
a(href='/obsidian/projects.html')
li.py-3.bg-pink.text-black.transition.duration-500.ease-in-out(
class='hover:bg-black hover:text-pink'
)
span Obsidian
a(href='https://github.com/aurora-dot')
li.py-3.bg-pink.text-black.transition.duration-500.ease-in-out(
class='hover:bg-black hover:text-pink'
)
span Projects
a(href='https://blog.pastel.codes')
li.py-3.bg-pink.text-black.transition.duration-500.ease-in-out(
class='hover:bg-black hover:text-pink'
)
span Blog
a(href='/contact')
li.py-3.bg-pink.text-black.transition.duration-500.ease-in-out(
class='hover:bg-black hover:text-pink'
)
span Contact
block content
div.mt-5
div.text-lg
h1.font-sans.text-6xl.wavy.mb-10 Hello.
p.mb-5 Im E, a 23-year-old full-stack developer with three years professional experience. I live in the UK.
p.mb-5 Im currently working at Bounce Technologies, where I contribute to or lead various projects using a bunch of different languages and technologies.
p.mb-5 I also do UI/UX design and DevOps! Im currently learning Go and adjusting to TypeScript.
p.mb-5 In my spare time I create digital art and make electronic music. I also like to discover and play experimental and artistic video games.
p.mb-5 Here are all of
a(class=" text-green" href="/obsidian/projects.html") my projects
span and my
a(class=" text-green" href="https://github.com/aurora-dot/") GitHub
if project
div
h1.font-sans.text-6xl.wavy.my-10 Projects.
div
each val in project
div(class="mb-10 text-center sm:text-left")
div.contents
a(href=val.url).contents
if val.feature_image
img(class="sm:w-2/3 mx-auto sm:mx-0" src=val.feature_image)
else
img(src="/images/logo.png")
div.mt-2
a(href=val.url)
span(class="font-sans text-2xl sm:text-3xl mt-3 mb-3") #{val.title}
p.text-lg #{val.excerpt}
.mt-5
.text-lg
h1.font-sans.text-6xl.wavy.mb-10 Hello.
p.mb-5 Im Esther, a 24-year-old full-stack developer with four years professional experience. I live in the UK.
p.mb-5 Im currently working at Kraken Technologies as a Software Engineer, part of the Client Engineering team.
p.mb-5 Im currently learning Rust and Go.
p.mb-5 In my spare time I create digital art, make electronic music, make jewellery and other random creative stuff. I also like to discover and play experimental and artistic video games, as well as listen to lots of music.
p.mb-5 Here are all of!{ ' ' }
|
a.text-green(href='/obsidian/projects.html') my projects
span !{ ' ' } and my !{ ' ' }
|
a.text-green(href='https://github.com/aurora-dot/') GitHub
| .
if project
div
h1.font-sans.text-6xl.wavy.my-10 Projects.
if blog
div
h1.font-sans.text-6xl.wavy.my-10 Blog.
div
each val in blog
div(class="mb-10 text-center sm:text-left")
div.contents
a(href=val.url).contents
if val.feature_image
img(class="sm:w-2/3 mx-auto sm:mx-0" src=val.feature_image)
else
img(src="/images/logo.png")
div.mt-2
a(href=val.url)
span(class="font-sans text-2xl sm:text-3xl mt-3 mb-3") #{val.title}
p.text-lg #{val.excerpt}
div
each val in project
.mb-10.text-center(class='sm:text-left')
.contents
a.contents(href=val.url)
if val.feature_image
img.mx-auto(class='sm:w-2/3 sm:mx-0', src=val.feature_image)
else
img(src='/images/logo.png')
.mt-2
a(href=val.url)
span.font-sans.text-2xl.mt-3.mb-3(class='sm:text-3xl') #{ val.title }
p.text-lg #{ val.excerpt }
if blog
div
h1.font-sans.text-6xl.wavy.my-10 Blog.
div
each val in blog
.mb-10.text-center(class='sm:text-left')
.contents
a.contents(href=val.url)
if val.feature_image
img.mx-auto(class='sm:w-2/3 sm:mx-0', src=val.feature_image)
else
img(src='/images/logo.png')
.mt-2
a(href=val.url)
span.font-sans.text-2xl.mt-3.mb-3(class='sm:text-3xl') #{ val.title }
p.text-lg #{ val.excerpt }

View File

@@ -28,7 +28,7 @@ block content
br
| I'm
|
span.wavy E
span.wavy Esther
p I'm a Programmer & Designer from the UK.
p.pt-5 I like to make stuff.
@@ -56,14 +56,6 @@ block content
svg.mt-5(role='img' viewbox='0 0 24 24' xmlns='http://www.w3.org/2000/svg')
title Matrix icon
path(d='M.632.55v22.9H2.28V24H0V0h2.28v.55zm7.043 7.26v1.157h.033c.309-.443.683-.784 1.117-1.024.433-.245.936-.365 1.5-.365.54 0 1.033.107 1.481.314.448.208.785.582 1.02 1.108.254-.374.6-.706 1.034-.992.434-.287.95-.43 1.546-.43.453 0 .872.056 1.26.167.388.11.716.286.993.53.276.245.489.559.646.951.152.392.23.863.23 1.417v5.728h-2.349V11.52c0-.286-.01-.559-.032-.812a1.755 1.755 0 0 0-.18-.66 1.106 1.106 0 0 0-.438-.448c-.194-.11-.457-.166-.785-.166-.332 0-.6.064-.803.189a1.38 1.38 0 0 0-.48.499 1.946 1.946 0 0 0-.231.696 5.56 5.56 0 0 0-.06.785v4.768h-2.35v-4.8c0-.254-.004-.503-.018-.752a2.074 2.074 0 0 0-.143-.688 1.052 1.052 0 0 0-.415-.503c-.194-.125-.476-.19-.854-.19-.111 0-.259.024-.439.074-.18.051-.36.143-.53.282-.171.138-.319.337-.439.595-.12.259-.18.6-.18 1.02v4.966H5.46V7.81zm15.693 15.64V.55H21.72V0H24v24h-2.28v-.55z')
a(href="https://twitter.com/ErrorFacade" target="_blank")
svg.mt-5(role='img' viewbox='0 0 24 24' xmlns='http://www.w3.org/2000/svg')
title Twitter icon
path(d='M23.954 4.569c-.885.389-1.83.654-2.825.775 1.014-.611 1.794-1.574 2.163-2.723-.951.555-2.005.959-3.127 1.184-.896-.959-2.173-1.559-3.591-1.559-2.717 0-4.92 2.203-4.92 4.917 0 .39.045.765.127 1.124C7.691 8.094 4.066 6.13 1.64 3.161c-.427.722-.666 1.561-.666 2.475 0 1.71.87 3.213 2.188 4.096-.807-.026-1.566-.248-2.228-.616v.061c0 2.385 1.693 4.374 3.946 4.827-.413.111-.849.171-1.296.171-.314 0-.615-.03-.916-.086.631 1.953 2.445 3.377 4.604 3.417-1.68 1.319-3.809 2.105-6.102 2.105-.39 0-.779-.023-1.17-.067 2.189 1.394 4.768 2.209 7.557 2.209 9.054 0 13.999-7.496 13.999-13.986 0-.209 0-.42-.015-.63.961-.689 1.8-1.56 2.46-2.548l-.047-.02z')
a(href="https://instagram.com/_e.psd" target="_blank")
svg.my-5(role='img' viewbox='0 0 24 24' xmlns='http://www.w3.org/2000/svg')
title Instagram icon
path(d='M12 0C8.74 0 8.333.015 7.053.072 5.775.132 4.905.333 4.14.63c-.789.306-1.459.717-2.126 1.384S.935 3.35.63 4.14C.333 4.905.131 5.775.072 7.053.012 8.333 0 8.74 0 12s.015 3.667.072 4.947c.06 1.277.261 2.148.558 2.913.306.788.717 1.459 1.384 2.126.667.666 1.336 1.079 2.126 1.384.766.296 1.636.499 2.913.558C8.333 23.988 8.74 24 12 24s3.667-.015 4.947-.072c1.277-.06 2.148-.262 2.913-.558.788-.306 1.459-.718 2.126-1.384.666-.667 1.079-1.335 1.384-2.126.296-.765.499-1.636.558-2.913.06-1.28.072-1.687.072-4.947s-.015-3.667-.072-4.947c-.06-1.277-.262-2.149-.558-2.913-.306-.789-.718-1.459-1.384-2.126C21.319 1.347 20.651.935 19.86.63c-.765-.297-1.636-.499-2.913-.558C15.667.012 15.26 0 12 0zm0 2.16c3.203 0 3.585.016 4.85.071 1.17.055 1.805.249 2.227.415.562.217.96.477 1.382.896.419.42.679.819.896 1.381.164.422.36 1.057.413 2.227.057 1.266.07 1.646.07 4.85s-.015 3.585-.074 4.85c-.061 1.17-.256 1.805-.421 2.227-.224.562-.479.96-.899 1.382-.419.419-.824.679-1.38.896-.42.164-1.065.36-2.235.413-1.274.057-1.649.07-4.859.07-3.211 0-3.586-.015-4.859-.074-1.171-.061-1.816-.256-2.236-.421-.569-.224-.96-.479-1.379-.899-.421-.419-.69-.824-.9-1.38-.165-.42-.359-1.065-.42-2.235-.045-1.26-.061-1.649-.061-4.844 0-3.196.016-3.586.061-4.861.061-1.17.255-1.814.42-2.234.21-.57.479-.96.9-1.381.419-.419.81-.689 1.379-.898.42-.166 1.051-.361 2.221-.421 1.275-.045 1.65-.06 4.859-.06l.045.03zm0 3.678c-3.405 0-6.162 2.76-6.162 6.162 0 3.405 2.76 6.162 6.162 6.162 3.405 0 6.162-2.76 6.162-6.162 0-3.405-2.76-6.162-6.162-6.162zM12 16c-2.21 0-4-1.79-4-4s1.79-4 4-4 4 1.79 4 4-1.79 4-4 4zm7.846-10.405c0 .795-.646 1.44-1.44 1.44-.795 0-1.44-.646-1.44-1.44 0-.794.646-1.439 1.44-1.439.793-.001 1.44.645 1.44 1.439z')
block scripts
script(src="/javascript/index.js")

View File

@@ -4,7 +4,7 @@ html
meta(http-equiv="content-type" content="text/html; charset=UTF-8")
meta(name="viewport" content="width=device-width, initial-scale=1")
title EEEE. // #{title}
title ESTR. // #{title}
meta(name="description" content=description)
link(rel='icon' type='image/png' sizes='32x32' href='/images/favicon-32x32.png')
@@ -20,7 +20,7 @@ html
div.relative.flex.items-center.justify-between.h-16
div.flex-shrink-0.flex.items-center
p.block.text-3xl.font-extra.font
a(href="/") EEEE.
a(href="/") ESTR.
div(class="absolute inset-y-0 right-0 flex items-center")
div(id="menu").tham.tham-e-squeeze.tham-w-8
@@ -39,7 +39,7 @@ html
p.font-mono © 2020 |
|
|
a(href="/").underline EEEE.
a(href="/").underline ESTR.
script(src="/javascript/jquery-3.5.1.min.js")
script(src="/javascript/nav.js")