Ethan Thoma
-
- ML graduate student @ STASER Lab UBC
-
- Focused on NLP and RL research
-
Contact:
--
-
- xitter (@EthanBThoma) -
- GitHub -
@@ -18,15 +18,34 @@ | Tech | Stack | |-------|----------| -| Go | Backend | +| GO | Backend | | Htmx | Frontend | | Turso | Database | +We use [templ](https://github.com/a-h/templ) for templating and [tailwindcss](https://github.com/tailwindlabs/tailwindcss) +for styles. So it is technically more like the GoTTTH stack... + ## Building + Running -The nix flake has three derivations: +The nix flake has four derivations: - .#default: this produces the webserver binary - .#container: docker image containing the webserver binary - .#uploader: simple CLI to upload my markdown blogs +- .#blob: a WIP blob storage service I plan to use for my images + +## Developing + +The [make file](./Makefile) in root is setup for running air w/ livereload. +It will run tailwindcss, templ, and air. + +> [!TIP] +> You can also locally deply the docker image using `make docker`. + +The webserver assumes the port is set to ":8080". This should be set in your dotenv. +The dotenv file should contain: +- TURSO_DATABASE_URL +- TURSO_AUTH_TOKEN +- WEBSERVER_PORT -You can run it test the webserver locally with docker with `make run`. +> [!NOTE] +> WEBSERVER_PORT will probably be moved to the flake config instead diff --git a/client/main.odin b/client/main.odin deleted file mode 100644 index 23acd0b..0000000 --- a/client/main.odin +++ /dev/null @@ -1,46 +0,0 @@ -//+build js -package main - -import "base:runtime" -import "vendor:wasm/js" - -HTML_Canvas_ID :: "wasm" - -Context :: struct { - initialized: bool, - accumulated_time: f64, -} - -state: Context = { - initialized = false, - accumulated_time = 1, -} - -main :: proc() {} - -run :: proc() { - state.initialized = true -} - -@(export) -step :: proc(delta_time: f64) -> (keep_going: bool) { - if !state.initialized { - return true - } - state.accumulated_time += delta_time - - if state.accumulated_time > 1 { - frame(state.accumulated_time) - } - - for state.accumulated_time > 1 { - state.accumulated_time -= 1 - } - - return true -} - -frame :: proc(delta_time: f64) {} - -@(private = "file", fini) -finish :: proc() {} diff --git a/cmd/webserver/components/ascii/ascii.css b/cmd/webserver/components/ascii/ascii.css deleted file mode 100644 index 328fef4..0000000 --- a/cmd/webserver/components/ascii/ascii.css +++ /dev/null @@ -1,14 +0,0 @@ -.ascii { - display: block; - width: 100%; - line-height: 0; - text-wrap: nowrap; - white-space-collapse: preserve; - text-align: center; - - & .ascii-char { - display: inline-block; - font-size: 5px; - width: 3px; - } -} diff --git a/cmd/webserver/components/ascii/ascii.go b/cmd/webserver/components/ascii/ascii.go deleted file mode 100644 index ea67071..0000000 --- a/cmd/webserver/components/ascii/ascii.go +++ /dev/null @@ -1,21 +0,0 @@ -package components - -import ( - "html/template" -) - -type Props struct { - Ascii [][]string -} - -func (props Props) Component(t *template.Template) error { - name := "ascii" - - filepath := "cmd/webserver/components/" + name + "/" + name + ".tmpl" - - if _, err := t.New(name + "-component").ParseFiles(filepath); err != nil { - return err - } else { - return nil - } -} diff --git a/cmd/webserver/components/ascii/ascii.tmpl b/cmd/webserver/components/ascii/ascii.tmpl deleted file mode 100644 index b24c244..0000000 --- a/cmd/webserver/components/ascii/ascii.tmpl +++ /dev/null @@ -1,7 +0,0 @@ -{{ define "ascii" }} -
- {{ range .Ascii }}
- {{ range $char := . }}{{ $char }}{{ end }}
- {{ end }} -
-{{ end }}
diff --git a/cmd/webserver/components/footer/footer.css b/cmd/webserver/components/footer/footer.css
deleted file mode 100644
index 28b18e5..0000000
--- a/cmd/webserver/components/footer/footer.css
+++ /dev/null
@@ -1,10 +0,0 @@
-footer {
- background-color: var(--clr-text);
- color: var(--clr-base);
- border-block-start: var(--space-3xs) solid var(--clr-high);
- font-size: var(--fs-100);
- margin-block-start: var(--space-xl);
- padding-block: var(--space-s);
- text-align: center;
- width: 100%;
-}
diff --git a/cmd/webserver/components/footer/footer.go b/cmd/webserver/components/footer/footer.go
deleted file mode 100644
index b05e665..0000000
--- a/cmd/webserver/components/footer/footer.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package components
-
-import (
- "html/template"
-)
-
-type Props struct{}
-
-func (props Props) Component(t *template.Template) error {
- name := "footer"
-
- filepath := "cmd/webserver/components/" + name + "/" + name + ".tmpl"
-
- if _, err := t.New(name + "-component").ParseFiles(filepath); err != nil {
- return err
- } else {
- return nil
- }
-}
diff --git a/cmd/webserver/components/footer/footer.tmpl b/cmd/webserver/components/footer/footer.tmpl
deleted file mode 100644
index 743bf4c..0000000
--- a/cmd/webserver/components/footer/footer.tmpl
+++ /dev/null
@@ -1,5 +0,0 @@
-{{ define "footer" }}
-
-{{ end }}
diff --git a/cmd/webserver/components/header/header.css b/cmd/webserver/components/header/header.css
deleted file mode 100644
index d9b1c3b..0000000
--- a/cmd/webserver/components/header/header.css
+++ /dev/null
@@ -1,38 +0,0 @@
-header {
- align-items: center;
- display: flex;
- flex-direction: column;
- margin-block-end: var(--space-s-l);
- padding-block: var(--space-xs-s);
-
- & nav {
- width: 100%;
-
- & a.selected {
- font-weight: 700;
- text-decoration: underline;
- }
-
- & ul {
- display: flex;
- justify-content: space-evenly;
- list-style-type: none;
- text-align: center;
-
- & li {
- flex: 1;
-
- & a {
- display: block;
- padding-block: var(--space-2xs);
- padding-inline: var(--space-xs);
- }
- }
- }
- }
-
- .divider {
- border-block-start: var(--space-3xs) solid var(--clr-high);
- width: 100%;
- }
-}
diff --git a/cmd/webserver/components/header/header.go b/cmd/webserver/components/header/header.go
deleted file mode 100644
index c2f3b2e..0000000
--- a/cmd/webserver/components/header/header.go
+++ /dev/null
@@ -1,39 +0,0 @@
-package components
-
-import (
- "html/template"
-
- ascii "personal-website/cmd/webserver/components/ascii"
- nav "personal-website/cmd/webserver/components/nav"
-)
-
-type Props struct {
- Ascii [][]string
- PageCurrent string
- Pages []string
-}
-
-func (props Props) Component(t *template.Template) error {
- name := "header"
-
- filepath := "cmd/webserver/components/" + name + "/" + name + ".tmpl"
-
- if err := (ascii.Props{
- Ascii: props.Ascii,
- }.Component(t)); err != nil {
- return err
- }
-
- if err := (nav.Props{
- PageCurrent: props.PageCurrent,
- Pages: props.Pages,
- }.Component(t)); err != nil {
- return err
- }
-
- if _, err := t.New(name + "-component").ParseFiles(filepath); err != nil {
- return err
- } else {
- return nil
- }
-}
diff --git a/cmd/webserver/components/header/header.tmpl b/cmd/webserver/components/header/header.tmpl
deleted file mode 100644
index eedc4d6..0000000
--- a/cmd/webserver/components/header/header.tmpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{ define "header" }}
- - {{ end }} -