add basic config and server files

This commit is contained in:
Pavocracy 2024-02-03 11:17:47 +10:00
parent 18faa41e4c
commit 9eaf6b12a7
Signed by: Pavocracy
GPG Key ID: 4669764A8BBA94F9
14 changed files with 170 additions and 4529 deletions

2
.gitignore vendored
View File

@ -1,2 +1,2 @@
node_modules/
dist/
lib/

BIN
bun.lockb

Binary file not shown.

17
config/www.service Normal file
View File

@ -0,0 +1,17 @@
[Unit]
Description=Pavocracy's Website
After=syslog.target
After=network.target
[Service]
Type=exec
User=www-data
Group=www-data
WorkingDirectory=/var/www/www/
ExecStartPre=/usr/bin/git pull --force && /usr/bin/bun run prod
ExecStart=/usr/bin/bun run src/server.ts --domain www.pavocracy.dev --analytics visits.pavocracy.dev
Restart=on-failure
RestartSec=3s
[Install]
WantedBy=multi-user.target

View File

@ -4,7 +4,8 @@
"type": "module",
"scripts": {
"setup": "bun run setup.ts",
"dev": "bun --hot run server.ts"
"prod": "bun run setup.ts --install --production",
"dev": "bun --hot run src/server.ts"
},
"devDependencies": {
"@types/bun": "latest"
@ -14,6 +15,7 @@
},
"dependencies": {
"htmx.org": "^1.9.10",
"plausible-tracker": "^0.3.8",
"tailwindcss": "^3.4.1"
}
}

12
pages/humans.txt Normal file
View File

@ -0,0 +1,12 @@
/* TEAM */
Programmer: Pavocracy
Contact: pavocracy@pm.me
/* THANKS */
Design help: Jaxxy
/* SITE */
Last update: 2024/02/03
Standards: HTML5, CSS3
Components: HTMX, TailWindCSS
Software: VSCodium, Bun

View File

@ -7,7 +7,8 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href="styles.css" rel="stylesheet">
<link href="humans.txt" rel="author">
<link href="tailwind.css" rel="stylesheet">
<script src="htmx.js"></script>
</head>

2
pages/robots.txt Normal file
View File

@ -0,0 +1,2 @@
user-agent: *
allow: *

View File

@ -3,16 +3,14 @@
// Find this project at https://code.pavocracy.dev/personal-projects/www
import { readdirSync } from "node:fs"
import { run_dir } from "../server"
import { root_dir } from "../src/server"
export function getBlogPosts(): string {
var blog_posts = ""
const files = readdirSync(`${run_dir}/content`)
let blog_posts = ""
const files = readdirSync(`${root_dir}/content`)
files.sort((a, b) => a > b ? -1 : 1)
for (const curr_file of files) {
blog_posts += `<li>${curr_file.split(".", 1)}</li>`
}
return blog_posts
}

View File

@ -1,52 +0,0 @@
#!/usr/bin/env bun
// Copyright (c) 2024 Pavocracy <pavocracy@pm.me>
// This file is released under MIT License
// Find this project at https://code.pavocracy.dev/personal-projects/www
import fs from "fs"
import { getBlogPosts } from "./routes/blog"
console.log("Listening on port 3000")
const run_dir = import.meta.dir
console.log(`Running from ${run_dir}`)
const date_fmt = new Intl.DateTimeFormat("en-AU", {
year: "2-digit",
month: "2-digit",
day: "2-digit",
hour: "2-digit",
minute: "2-digit",
second: "2-digit",
timeZoneName: "short",
hour12: true,
timeZone: "Australia/Brisbane",
})
Bun.serve({
fetch(req, server) {
const client = server.requestIP(req)
const url = new URL(req.url)
console.log(`[${date_fmt.format(new Date())}] ${client?.address}:${client?.port} ${req.method} ${url}`)
if (url.pathname === "/") url.pathname = "/index.html"
let requested_file = `${run_dir}/`
if (url.pathname.endsWith(".html")) requested_file += `pages/${url.pathname}`
if (url.pathname.endsWith(".css") || url.pathname.endsWith(".js")) requested_file += `static/${url.pathname}`
if (url.pathname.endsWith(".png") || url.pathname.endsWith(".ico")) requested_file += `assets/${url.pathname}`
if (url.pathname === "/blog") {
return new Response(getBlogPosts())
}
if (fs.existsSync(requested_file)) {
return new Response(Bun.file(requested_file))
}
return Response.json("Not Found", 404)
},
})
export { run_dir }

View File

@ -4,19 +4,33 @@
// Find this project at https://code.pavocracy.dev/personal-projects/www
import { $ } from "bun"
import { sys } from "typescript"
const src_dir = import.meta.dir
console.log("Starting setup process...")
console.log("Installing dependencies")
await $`bun install`
if (sys.args.includes("--production")) {
$`bun install --production`
} else {
$`bun install`
}
console.log("Building tailwindcss")
await $`bun x tailwindcss -o ${src_dir}/static/styles.css`
await $`bun x tailwindcss -o ${src_dir}/lib/tailwind.css --minify`
console.log("Copying htmx.js from node_modules")
const htmx = Bun.file(`${src_dir}/node_modules/htmx.org/dist/htmx.js`)
await Bun.write(`${src_dir}/static/htmx.js`, htmx)
console.log("Fetching htmx from node_modules")
const htmx = Bun.file(`${src_dir}/node_modules/htmx.org/dist/htmx.min.js`)
await Bun.write(`${src_dir}/lib/htmx.js`, htmx)
console.log("Build finished!")
if (sys.args.includes("--install")) {
console.log("Installing systemd service")
await $`cp --target-directory=/etc/systemd/system/ ${src_dir}/config/www.service`
await $`systemctl daemon-reload`
await $`systemctl enable www.service`
console.log("Setting group to www-data")
await $`chown -R :www-data ${src_dir}`
}
console.log("Setup finished!")

32
src/handler.ts Normal file
View File

@ -0,0 +1,32 @@
#!/usr/bin/env bun
// Copyright (c) 2024 Pavocracy <pavocracy@pm.me>
// This file is released under MIT License
// Find this project at https://code.pavocracy.dev/personal-projects/www
import fs from "fs"
import { root_dir, trackPageview, trackEvent } from "./server"
import { getBlogPosts } from "../routes/blog"
// Define functions to handle pages and routes
function HandlePages(pathname: string) {
let requested_file = `${root_dir}/`
if (pathname.endsWith(".txt") || pathname.endsWith(".html")) requested_file += `pages/${pathname}`
if (pathname.endsWith(".css") || pathname.endsWith(".js")) requested_file += `lib/${pathname}`
if (pathname.endsWith(".png") || pathname.endsWith(".ico")) requested_file += `assets/${pathname}`
if (fs.existsSync(requested_file)) {
trackPageview?.()
return Bun.file(requested_file)
}
return null
}
function HandleRoute(pathname: string) {
if (pathname === "/blog") {
trackEvent?.("getBlogPosts")
return getBlogPosts()
}
return null
}
export { HandlePages, HandleRoute }

78
src/server.ts Executable file
View File

@ -0,0 +1,78 @@
#!/usr/bin/env bun
// Copyright (c) 2024 Pavocracy <pavocracy@pm.me>
// This file is released under MIT License
// Find this project at https://code.pavocracy.dev/personal-projects/www
import { sys } from "typescript"
import { resolve } from "path"
import Plausible from "plausible-tracker"
import { HandlePages, HandleRoute } from "./handler"
// Allow these options to be set with cli arguments
// Must have unique first letter or cli parser below breaks
let cli_options = new Map<string, string>([
["root", resolve(`${import.meta.dir}/..`)],
["port", "3000"],
["domain", "localhost"],
["analytics", ""]
])
// Basic cli parser which assumes standard patterns
// for example: -p 8080 or --port 8080
// -----------port 8080 works too lol
for (let [idx, arg] of sys.args.entries()) {
if (!arg.startsWith("-")) {
continue
}
arg = arg.replaceAll("-", "")
for (const option of cli_options.keys()) {
if (arg === option || arg.slice(0, 1) === option.slice(0, 1)) {
if (sys.args.length >= idx + 1) {
const value = sys.args[idx + 1]
cli_options.set(option, value)
console.log(`${option} set to ${value}`)
break
}
}
}
}
// Setup configuration for server
const root_dir = cli_options.get("root")
const date_fmt = new Intl.DateTimeFormat("en-AU", {
year: "2-digit",
month: "2-digit",
day: "2-digit",
hour: "2-digit",
minute: "2-digit",
second: "2-digit",
timeZoneName: "short",
hour12: true,
timeZone: "Australia/Brisbane",
})
if (cli_options.get("analytics")) {
var { trackEvent, trackPageview } = Plausible({
domain: cli_options.get("domain"),
apiHost: cli_options.get("analytics"),
"trackLocalhost": false
})
}
// Main server request handler
console.log(`Running from ${root_dir}`)
console.log(`Running on port ${cli_options.get("port")}`)
Bun.serve({
port: cli_options.get("port"),
fetch(req, server) {
const client = server.requestIP(req)
const url = new URL(req.url)
if (url.pathname === "/") url.pathname = "/index.html"
const handle = url.pathname.split(".").length > 1 ? HandlePages(url.pathname) : HandleRoute(url.pathname)
const res = handle ? new Response(handle) : Response.json("Not Found", 404)
console.log(`[${date_fmt.format(new Date())}] ${client?.address}:${client?.port} ${req.method} ${url} => ${res.status}`)
return res
}
})
export { root_dir, cli_options, trackEvent, trackPageview }

File diff suppressed because it is too large Load Diff

View File

@ -1,558 +0,0 @@
/*
! tailwindcss v3.4.1 | MIT License | https://tailwindcss.com
*/
/*
1. Prevent padding and border from affecting element width. (https://github.com/mozdevs/cssremedy/issues/4)
2. Allow adding a border to an element by just adding a border-width. (https://github.com/tailwindcss/tailwindcss/pull/116)
*/
*,
::before,
::after {
box-sizing: border-box;
/* 1 */
border-width: 0;
/* 2 */
border-style: solid;
/* 2 */
border-color: #e5e7eb;
/* 2 */
}
::before,
::after {
--tw-content: '';
}
/*
1. Use a consistent sensible line-height in all browsers.
2. Prevent adjustments of font size after orientation changes in iOS.
3. Use a more readable tab size.
4. Use the user's configured `sans` font-family by default.
5. Use the user's configured `sans` font-feature-settings by default.
6. Use the user's configured `sans` font-variation-settings by default.
7. Disable tap highlights on iOS
*/
html,
:host {
line-height: 1.5;
/* 1 */
-webkit-text-size-adjust: 100%;
/* 2 */
-moz-tab-size: 4;
/* 3 */
-o-tab-size: 4;
tab-size: 4;
/* 3 */
font-family: ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
/* 4 */
font-feature-settings: normal;
/* 5 */
font-variation-settings: normal;
/* 6 */
-webkit-tap-highlight-color: transparent;
/* 7 */
}
/*
1. Remove the margin in all browsers.
2. Inherit line-height from `html` so users can set them as a class directly on the `html` element.
*/
body {
margin: 0;
/* 1 */
line-height: inherit;
/* 2 */
}
/*
1. Add the correct height in Firefox.
2. Correct the inheritance of border color in Firefox. (https://bugzilla.mozilla.org/show_bug.cgi?id=190655)
3. Ensure horizontal rules are visible by default.
*/
hr {
height: 0;
/* 1 */
color: inherit;
/* 2 */
border-top-width: 1px;
/* 3 */
}
/*
Add the correct text decoration in Chrome, Edge, and Safari.
*/
abbr:where([title]) {
-webkit-text-decoration: underline dotted;
text-decoration: underline dotted;
}
/*
Remove the default font size and weight for headings.
*/
h1,
h2,
h3,
h4,
h5,
h6 {
font-size: inherit;
font-weight: inherit;
}
/*
Reset links to optimize for opt-in styling instead of opt-out.
*/
a {
color: inherit;
text-decoration: inherit;
}
/*
Add the correct font weight in Edge and Safari.
*/
b,
strong {
font-weight: bolder;
}
/*
1. Use the user's configured `mono` font-family by default.
2. Use the user's configured `mono` font-feature-settings by default.
3. Use the user's configured `mono` font-variation-settings by default.
4. Correct the odd `em` font sizing in all browsers.
*/
code,
kbd,
samp,
pre {
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
/* 1 */
font-feature-settings: normal;
/* 2 */
font-variation-settings: normal;
/* 3 */
font-size: 1em;
/* 4 */
}
/*
Add the correct font size in all browsers.
*/
small {
font-size: 80%;
}
/*
Prevent `sub` and `sup` elements from affecting the line height in all browsers.
*/
sub,
sup {
font-size: 75%;
line-height: 0;
position: relative;
vertical-align: baseline;
}
sub {
bottom: -0.25em;
}
sup {
top: -0.5em;
}
/*
1. Remove text indentation from table contents in Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=999088, https://bugs.webkit.org/show_bug.cgi?id=201297)
2. Correct table border color inheritance in all Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=935729, https://bugs.webkit.org/show_bug.cgi?id=195016)
3. Remove gaps between table borders by default.
*/
table {
text-indent: 0;
/* 1 */
border-color: inherit;
/* 2 */
border-collapse: collapse;
/* 3 */
}
/*
1. Change the font styles in all browsers.
2. Remove the margin in Firefox and Safari.
3. Remove default padding in all browsers.
*/
button,
input,
optgroup,
select,
textarea {
font-family: inherit;
/* 1 */
font-feature-settings: inherit;
/* 1 */
font-variation-settings: inherit;
/* 1 */
font-size: 100%;
/* 1 */
font-weight: inherit;
/* 1 */
line-height: inherit;
/* 1 */
color: inherit;
/* 1 */
margin: 0;
/* 2 */
padding: 0;
/* 3 */
}
/*
Remove the inheritance of text transform in Edge and Firefox.
*/
button,
select {
text-transform: none;
}
/*
1. Correct the inability to style clickable types in iOS and Safari.
2. Remove default button styles.
*/
button,
[type='button'],
[type='reset'],
[type='submit'] {
-webkit-appearance: button;
/* 1 */
background-color: transparent;
/* 2 */
background-image: none;
/* 2 */
}
/*
Use the modern Firefox focus style for all focusable elements.
*/
:-moz-focusring {
outline: auto;
}
/*
Remove the additional `:invalid` styles in Firefox. (https://github.com/mozilla/gecko-dev/blob/2f9eacd9d3d995c937b4251a5557d95d494c9be1/layout/style/res/forms.css#L728-L737)
*/
:-moz-ui-invalid {
box-shadow: none;
}
/*
Add the correct vertical alignment in Chrome and Firefox.
*/
progress {
vertical-align: baseline;
}
/*
Correct the cursor style of increment and decrement buttons in Safari.
*/
::-webkit-inner-spin-button,
::-webkit-outer-spin-button {
height: auto;
}
/*
1. Correct the odd appearance in Chrome and Safari.
2. Correct the outline style in Safari.
*/
[type='search'] {
-webkit-appearance: textfield;
/* 1 */
outline-offset: -2px;
/* 2 */
}
/*
Remove the inner padding in Chrome and Safari on macOS.
*/
::-webkit-search-decoration {
-webkit-appearance: none;
}
/*
1. Correct the inability to style clickable types in iOS and Safari.
2. Change font properties to `inherit` in Safari.
*/
::-webkit-file-upload-button {
-webkit-appearance: button;
/* 1 */
font: inherit;
/* 2 */
}
/*
Add the correct display in Chrome and Safari.
*/
summary {
display: list-item;
}
/*
Removes the default spacing and border for appropriate elements.
*/
blockquote,
dl,
dd,
h1,
h2,
h3,
h4,
h5,
h6,
hr,
figure,
p,
pre {
margin: 0;
}
fieldset {
margin: 0;
padding: 0;
}
legend {
padding: 0;
}
ol,
ul,
menu {
list-style: none;
margin: 0;
padding: 0;
}
/*
Reset default styling for dialogs.
*/
dialog {
padding: 0;
}
/*
Prevent resizing textareas horizontally by default.
*/
textarea {
resize: vertical;
}
/*
1. Reset the default placeholder opacity in Firefox. (https://github.com/tailwindlabs/tailwindcss/issues/3300)
2. Set the default placeholder color to the user's configured gray 400 color.
*/
input::-moz-placeholder, textarea::-moz-placeholder {
opacity: 1;
/* 1 */
color: #9ca3af;
/* 2 */
}
input::placeholder,
textarea::placeholder {
opacity: 1;
/* 1 */
color: #9ca3af;
/* 2 */
}
/*
Set the default cursor for buttons.
*/
button,
[role="button"] {
cursor: pointer;
}
/*
Make sure disabled buttons don't get the pointer cursor.
*/
:disabled {
cursor: default;
}
/*
1. Make replaced elements `display: block` by default. (https://github.com/mozdevs/cssremedy/issues/14)
2. Add `vertical-align: middle` to align replaced elements more sensibly by default. (https://github.com/jensimmons/cssremedy/issues/14#issuecomment-634934210)
This can trigger a poorly considered lint error in some tools but is included by design.
*/
img,
svg,
video,
canvas,
audio,
iframe,
embed,
object {
display: block;
/* 1 */
vertical-align: middle;
/* 2 */
}
/*
Constrain images and videos to the parent width and preserve their intrinsic aspect ratio. (https://github.com/mozdevs/cssremedy/issues/14)
*/
img,
video {
max-width: 100%;
height: auto;
}
/* Make elements with the HTML hidden attribute stay hidden by default */
[hidden] {
display: none;
}
*, ::before, ::after {
--tw-border-spacing-x: 0;
--tw-border-spacing-y: 0;
--tw-translate-x: 0;
--tw-translate-y: 0;
--tw-rotate: 0;
--tw-skew-x: 0;
--tw-skew-y: 0;
--tw-scale-x: 1;
--tw-scale-y: 1;
--tw-pan-x: ;
--tw-pan-y: ;
--tw-pinch-zoom: ;
--tw-scroll-snap-strictness: proximity;
--tw-gradient-from-position: ;
--tw-gradient-via-position: ;
--tw-gradient-to-position: ;
--tw-ordinal: ;
--tw-slashed-zero: ;
--tw-numeric-figure: ;
--tw-numeric-spacing: ;
--tw-numeric-fraction: ;
--tw-ring-inset: ;
--tw-ring-offset-width: 0px;
--tw-ring-offset-color: #fff;
--tw-ring-color: rgb(59 130 246 / 0.5);
--tw-ring-offset-shadow: 0 0 #0000;
--tw-ring-shadow: 0 0 #0000;
--tw-shadow: 0 0 #0000;
--tw-shadow-colored: 0 0 #0000;
--tw-blur: ;
--tw-brightness: ;
--tw-contrast: ;
--tw-grayscale: ;
--tw-hue-rotate: ;
--tw-invert: ;
--tw-saturate: ;
--tw-sepia: ;
--tw-drop-shadow: ;
--tw-backdrop-blur: ;
--tw-backdrop-brightness: ;
--tw-backdrop-contrast: ;
--tw-backdrop-grayscale: ;
--tw-backdrop-hue-rotate: ;
--tw-backdrop-invert: ;
--tw-backdrop-opacity: ;
--tw-backdrop-saturate: ;
--tw-backdrop-sepia: ;
}
::backdrop {
--tw-border-spacing-x: 0;
--tw-border-spacing-y: 0;
--tw-translate-x: 0;
--tw-translate-y: 0;
--tw-rotate: 0;
--tw-skew-x: 0;
--tw-skew-y: 0;
--tw-scale-x: 1;
--tw-scale-y: 1;
--tw-pan-x: ;
--tw-pan-y: ;
--tw-pinch-zoom: ;
--tw-scroll-snap-strictness: proximity;
--tw-gradient-from-position: ;
--tw-gradient-via-position: ;
--tw-gradient-to-position: ;
--tw-ordinal: ;
--tw-slashed-zero: ;
--tw-numeric-figure: ;
--tw-numeric-spacing: ;
--tw-numeric-fraction: ;
--tw-ring-inset: ;
--tw-ring-offset-width: 0px;
--tw-ring-offset-color: #fff;
--tw-ring-color: rgb(59 130 246 / 0.5);
--tw-ring-offset-shadow: 0 0 #0000;
--tw-ring-shadow: 0 0 #0000;
--tw-shadow: 0 0 #0000;
--tw-shadow-colored: 0 0 #0000;
--tw-blur: ;
--tw-brightness: ;
--tw-contrast: ;
--tw-grayscale: ;
--tw-hue-rotate: ;
--tw-invert: ;
--tw-saturate: ;
--tw-sepia: ;
--tw-drop-shadow: ;
--tw-backdrop-blur: ;
--tw-backdrop-brightness: ;
--tw-backdrop-contrast: ;
--tw-backdrop-grayscale: ;
--tw-backdrop-hue-rotate: ;
--tw-backdrop-invert: ;
--tw-backdrop-opacity: ;
--tw-backdrop-saturate: ;
--tw-backdrop-sepia: ;
}
.text-3xl {
font-size: 1.875rem;
line-height: 2.25rem;
}
.font-bold {
font-weight: 700;
}
.underline {
text-decoration-line: underline;
}