Fix Docker and bio

Rename prepare step

Attempt docker fix

Docker fix

Fix bio and add pug prettier config

Fix spacing

Fix grammer
This commit is contained in:
E 2024-04-29 17:21:03 +01:00
parent b3aae82a2a
commit dec522c914
No known key found for this signature in database
GPG Key ID: 9D57A2D583601371
5 changed files with 119 additions and 69 deletions

View File

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

View File

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

36
package-lock.json generated
View File

@ -29,6 +29,7 @@
}, },
"devDependencies": { "devDependencies": {
"@eslint/js": "^9.1.1", "@eslint/js": "^9.1.1",
"@prettier/plugin-pug": "^3.0.0",
"eslint": "^9.1.1", "eslint": "^9.1.1",
"eslint-config-prettier": "^9.1.0", "eslint-config-prettier": "^9.1.0",
"globals": "^15.1.0", "globals": "^15.1.0",
@ -347,6 +348,32 @@
"node": ">= 8" "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": { "node_modules/@sendgrid/client": {
"version": "8.1.3", "version": "8.1.3",
"resolved": "https://registry.npmjs.org/@sendgrid/client/-/client-8.1.3.tgz", "resolved": "https://registry.npmjs.org/@sendgrid/client/-/client-8.1.3.tgz",
@ -5309,6 +5336,15 @@
"fastq": "^1.6.0" "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": { "@sendgrid/client": {
"version": "8.1.3", "version": "8.1.3",
"resolved": "https://registry.npmjs.org/@sendgrid/client/-/client-8.1.3.tgz", "resolved": "https://registry.npmjs.org/@sendgrid/client/-/client-8.1.3.tgz",

View File

@ -13,12 +13,12 @@
"scripts": { "scripts": {
"test": "echo \"Error: no test specified\" && exit 1", "test": "echo \"Error: no test specified\" && exit 1",
"dev": "npx nodemon ./bin/www -e js,pug,sass", "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", "watch-tailwind": "npx npm-watch",
"build-tailwind": "npx postcss src/tailwind.css -o public/stylesheets/style.css", "build-tailwind": "npx postcss src/tailwind.css -o public/stylesheets/style.css",
"lint": "prettier --check . && eslint .", "lint": "prettier --check . && eslint .",
"format": "prettier --write --ignore-path .gitignore .", "format": "prettier --write --ignore-path .gitignore .",
"prepare": "husky install" "husky-install": "husky install"
}, },
"dependencies": { "dependencies": {
"@sendgrid/mail": "^8.1.3", "@sendgrid/mail": "^8.1.3",
@ -42,6 +42,7 @@
}, },
"devDependencies": { "devDependencies": {
"@eslint/js": "^9.1.1", "@eslint/js": "^9.1.1",
"@prettier/plugin-pug": "^3.0.0",
"eslint": "^9.1.1", "eslint": "^9.1.1",
"eslint-config-prettier": "^9.1.0", "eslint-config-prettier": "^9.1.0",
"globals": "^15.1.0", "globals": "^15.1.0",

View File

@ -1,70 +1,83 @@
extends layout extends layout
block nav-links block nav-links
a(href='/') a(href='/')
li(class="py-3 bg-pink text-black hover:bg-black hover:text-pink transition duration-500 ease-in-out") li.py-3.bg-pink.text-black.transition.duration-500.ease-in-out(
span Home class='hover:bg-black hover:text-pink'
a(href='#') )
li(class="py-3 bg-black text-green hover:bg-pink hover:text-black transition duration-500 ease-in-out") span Home
span About a(href='#')
a(href='/obsidian/projects.html') li.py-3.bg-black.text-green.transition.duration-500.ease-in-out(
li(class="py-3 bg-pink text-black hover:bg-black hover:text-pink transition duration-500 ease-in-out") class='hover:bg-pink hover:text-black'
span Obsidian )
a(href='https://github.com/aurora-dot') span About
li(class="py-3 bg-pink text-black hover:bg-black hover:text-pink transition duration-500 ease-in-out") a(href='/obsidian/projects.html')
span Projects li.py-3.bg-pink.text-black.transition.duration-500.ease-in-out(
a(href='https://blog.pastel.codes') class='hover:bg-black hover:text-pink'
li(class="py-3 bg-pink text-black hover:bg-black hover:text-pink transition duration-500 ease-in-out") )
span Blog span Obsidian
a(href='/contact') 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") li.py-3.bg-pink.text-black.transition.duration-500.ease-in-out(
span Contact 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 block content
div.mt-5 .mt-5
div.text-lg .text-lg
h1.font-sans.text-6xl.wavy.mb-10 Hello. 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 E, a 22-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 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 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 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 p.mb-5 Here are all of!{ ' ' }
a(class=" text-green" href="/obsidian/projects.html") my projects |
span and my a.text-green(href='/obsidian/projects.html') my projects
a(class=" text-green" href="https://github.com/aurora-dot/") GitHub span !{ ' ' } and my !{ ' ' }
if project |
div a.text-green(href='https://github.com/aurora-dot/') GitHub
h1.font-sans.text-6xl.wavy.my-10 Projects. | .
if project
div div
each val in project h1.font-sans.text-6xl.wavy.my-10 Projects.
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}
if blog div
div each val in project
h1.font-sans.text-6xl.wavy.my-10 Blog. .mb-10.text-center(class='sm:text-left')
div .contents
each val in blog a.contents(href=val.url)
div(class="mb-10 text-center sm:text-left") if val.feature_image
div.contents img.mx-auto(class='sm:w-2/3 sm:mx-0', src=val.feature_image)
a(href=val.url).contents else
if val.feature_image img(src='/images/logo.png')
img(class="sm:w-2/3 mx-auto sm:mx-0" src=val.feature_image) .mt-2
else a(href=val.url)
img(src="/images/logo.png") span.font-sans.text-2xl.mt-3.mb-3(class='sm:text-3xl') #{ val.title }
div.mt-2 p.text-lg #{ val.excerpt }
a(href=val.url)
span(class="font-sans text-2xl sm:text-3xl mt-3 mb-3") #{val.title} if blog
p.text-lg #{val.excerpt} 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 }