diff --git a/src/main.rs b/src/main.rs index 1a892fa..8eb7b75 100644 --- a/src/main.rs +++ b/src/main.rs @@ -25,13 +25,13 @@ fn files(file: PathBuf) -> Option { NamedFile::open(Path::new("static/").join(file)).ok() } -#[get("/")] -fn index() -> Template { +#[get("/art")] +fn art() -> Template { let context = FlashContext { flash_name: None, flash_msg: None, }; - Template::render("index", &context) + Template::render("art", &context) } #[get("/background")] @@ -43,6 +43,42 @@ fn background() -> Template { Template::render("background", &context) } +#[get("/bacteria")] +fn bacteria() -> Template { + let context = FlashContext { + flash_name: None, + flash_msg: None, + }; + Template::render("bacteria", &context) +} + +#[get("/computers")] +fn computers() -> Template { + let context = FlashContext { + flash_name: None, + flash_msg: None, + }; + Template::render("computers", &context) +} + +#[get("/fungi")] +fn fungi() -> Template { + let context = FlashContext { + flash_name: None, + flash_msg: None, + }; + Template::render("fungi", &context) +} + +#[get("/")] +fn home() -> Template { + let context = FlashContext { + flash_name: None, + flash_msg: None, + }; + Template::render("home", &context) +} + #[get("/lists")] fn lists() -> Template { let context = FlashContext { @@ -52,6 +88,42 @@ fn lists() -> Template { Template::render("lists", &context) } +#[get("/plants")] +fn plants() -> Template { + let context = FlashContext { + flash_name: None, + flash_msg: None, + }; + Template::render("plants", &context) +} + +#[get("/meditation")] +fn meditation() -> Template { + let context = FlashContext { + flash_name: None, + flash_msg: None, + }; + Template::render("meditation", &context) +} + +#[get("/movement")] +fn movement() -> Template { + let context = FlashContext { + flash_name: None, + flash_msg: None, + }; + Template::render("movement", &context) +} + +#[get("/travel")] +fn travel() -> Template { + let context = FlashContext { + flash_name: None, + flash_msg: None, + }; + Template::render("travel", &context) +} + #[catch(404)] fn not_found() -> Template { debug!("404 Page Not Found"); @@ -64,7 +136,13 @@ fn not_found() -> Template { fn main() { rocket::ignite() - .mount("/", routes![files, index, background, lists]) + .mount( + "/", + routes![ + files, art, background, bacteria, computers, fungi, home, lists, plants, + meditation, movement, travel + ], + ) .register(catchers![not_found]) .attach(Template::fairing()) .launch(); diff --git a/static/art/aloe.jpg b/static/art/aloe.jpg new file mode 100644 index 0000000..55c16ba Binary files /dev/null and b/static/art/aloe.jpg differ diff --git a/static/art/birch_polypore.jpg b/static/art/birch_polypore.jpg new file mode 100644 index 0000000..e3311dd Binary files /dev/null and b/static/art/birch_polypore.jpg differ diff --git a/static/art/cordyceps_ant.jpg b/static/art/cordyceps_ant.jpg new file mode 100644 index 0000000..cc68535 Binary files /dev/null and b/static/art/cordyceps_ant.jpg differ diff --git a/static/art/death_is_not_the_end.jpg b/static/art/death_is_not_the_end.jpg new file mode 100644 index 0000000..59e4982 Binary files /dev/null and b/static/art/death_is_not_the_end.jpg differ diff --git a/static/art/enchanted_gano.jpg b/static/art/enchanted_gano.jpg new file mode 100644 index 0000000..47eb296 Binary files /dev/null and b/static/art/enchanted_gano.jpg differ diff --git a/static/art/halo.svg b/static/art/halo.svg new file mode 100644 index 0000000..082430a --- /dev/null +++ b/static/art/halo.svg @@ -0,0 +1,4 @@ + + + + diff --git a/static/art/hyphal_fusion.svg b/static/art/hyphal_fusion.svg new file mode 100644 index 0000000..49a2f10 --- /dev/null +++ b/static/art/hyphal_fusion.svg @@ -0,0 +1,4 @@ + + + + diff --git a/static/art/kestrel.jpg b/static/art/kestrel.jpg new file mode 100644 index 0000000..5f8a29f Binary files /dev/null and b/static/art/kestrel.jpg differ diff --git a/static/art/mystic_mountain.jpg b/static/art/mystic_mountain.jpg new file mode 100644 index 0000000..72bf649 Binary files /dev/null and b/static/art/mystic_mountain.jpg differ diff --git a/static/art/obsidian_artifact.jpg b/static/art/obsidian_artifact.jpg new file mode 100644 index 0000000..927ed69 Binary files /dev/null and b/static/art/obsidian_artifact.jpg differ diff --git a/static/art/physalis.jpg b/static/art/physalis.jpg new file mode 100644 index 0000000..8a9ffcf Binary files /dev/null and b/static/art/physalis.jpg differ diff --git a/static/art/pitcher_plant.jpg b/static/art/pitcher_plant.jpg new file mode 100644 index 0000000..3e825f7 Binary files /dev/null and b/static/art/pitcher_plant.jpg differ diff --git a/static/art/ring_monk.jpg b/static/art/ring_monk.jpg new file mode 100644 index 0000000..2bb1248 Binary files /dev/null and b/static/art/ring_monk.jpg differ diff --git a/static/art/shakuhachi.jpg b/static/art/shakuhachi.jpg new file mode 100644 index 0000000..1d61d93 Binary files /dev/null and b/static/art/shakuhachi.jpg differ diff --git a/static/art/wasp.jpg b/static/art/wasp.jpg new file mode 100644 index 0000000..79c24a2 Binary files /dev/null and b/static/art/wasp.jpg differ diff --git a/static/glyph_laetiporus.jpg b/static/glyph_laetiporus.jpg new file mode 100644 index 0000000..3c2a786 Binary files /dev/null and b/static/glyph_laetiporus.jpg differ diff --git a/templates/art.html.tera b/templates/art.html.tera new file mode 100644 index 0000000..12e90f5 --- /dev/null +++ b/templates/art.html.tera @@ -0,0 +1,30 @@ +{% extends "nav" %} +{% block content %} +

Art

+
+ Line drawing of an aloe plant in black ink on white paper + Line drawing of an American kestrel in black ink on white paper + Line drawing of a black oval surrounded by two rings of glyphs in black ink on white paper +
+
+ Stylised line drawing of a mountain with a teardrop-shaped symbol above it, with mountains and clouds in the background, in black ink on white paper + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+{%- endblock %} diff --git a/templates/background.html.tera b/templates/background.html.tera index 7b4cf32..32fe328 100644 --- a/templates/background.html.tera +++ b/templates/background.html.tera @@ -1,8 +1,8 @@ {% extends "nav" %} {% block content %}

Background

-

I was born and raised in the coastal city of Durban, South Africa, which lies between the Indian Ocean and Drakensberg Mountains. Following completion of high school I moved to Michigan, USA and completed a Bachelor of Science in anthropology (major) and biology (minor) at Grand Valley State University. I later returned to South Africa and completed a Master of Social Science in social anthropology at the University of Cape Town, with research focused on decentralised networks of medicinal plant harvesters and herbalists (Rasta bush doctors). I then went on to work as an applied anthropologist and ethnobotanist in the non-profit sector.

Following a year spent travelling in South America, I restructured my life and livelihood around my core interests: carbon-based and silicon-based technologies (biology and computers). Since then I have founded Harmonic Mycology, a mycology collective dedicated to developing and distributing mycelial medicines, teaching mushroom cultivation and encouraging the formation of humyn-fungal networks. In parallel to those activities, I have worked as an autodidactic software developer on private and open-source projects; most-recently, PeachCloud.

I hold a deep fascination with the processes through which humyns form relationships with other living beings. When not behind the keyboard, you can find me looking at mushrooms, riding my bicycle or reading sci-fi. I'm dreaming of a three-month adventure across Japan ⛩.

+ {%- endblock %} diff --git a/templates/bacteria.html.tera b/templates/bacteria.html.tera new file mode 100644 index 0000000..2613584 --- /dev/null +++ b/templates/bacteria.html.tera @@ -0,0 +1,5 @@ +{% extends "nav" %} +{% block content %} +

Bacteria

+
+{%- endblock %} diff --git a/templates/base.html.tera b/templates/base.html.tera index b1488c5..ea9315d 100644 --- a/templates/base.html.tera +++ b/templates/base.html.tera @@ -24,6 +24,30 @@ font-family: monospace; } + .col { + flex: 1; + padding: 1rem; + } + + @media (max-width: 400px) { + .col { + flex: 1; + padding: 1rem; + width: 90%; + } + } + + + .flex-grid { + display: flex; + } + + @media (max-width: 400px) { + .flex-grid { + display: block; + } + } + html { background-color: #fefefe; color: #111; diff --git a/templates/computers.html.tera b/templates/computers.html.tera new file mode 100644 index 0000000..ee5be9f --- /dev/null +++ b/templates/computers.html.tera @@ -0,0 +1,5 @@ +{% extends "nav" %} +{% block content %} +

Computers

+
+{%- endblock %} diff --git a/templates/fungi.html.tera b/templates/fungi.html.tera new file mode 100644 index 0000000..e96e5b6 --- /dev/null +++ b/templates/fungi.html.tera @@ -0,0 +1,5 @@ +{% extends "nav" %} +{% block content %} +

Fungi

+
+{%- endblock %} diff --git a/templates/index.html.tera b/templates/home.html.tera similarity index 88% rename from templates/index.html.tera rename to templates/home.html.tera index e1c0f1a..9c10f4f 100644 --- a/templates/index.html.tera +++ b/templates/home.html.tera @@ -1,6 +1,6 @@ {% extends "nav" %} {% block content %} - +

Welcome to the personal website of glyph.

Contact Information

diff --git a/templates/meditation.html.tera b/templates/meditation.html.tera new file mode 100644 index 0000000..f031839 --- /dev/null +++ b/templates/meditation.html.tera @@ -0,0 +1,5 @@ +{% extends "nav" %} +{% block content %} +

Meditation

+ +{%- endblock %} diff --git a/templates/movement.html.tera b/templates/movement.html.tera new file mode 100644 index 0000000..0cd147c --- /dev/null +++ b/templates/movement.html.tera @@ -0,0 +1,5 @@ +{% extends "nav" %} +{% block content %} +

Movement

+
+{%- endblock %} diff --git a/templates/nav.html.tera b/templates/nav.html.tera index 9005181..579d5de 100644 --- a/templates/nav.html.tera +++ b/templates/nav.html.tera @@ -4,15 +4,16 @@
{%- block content %}{%- endblock %} diff --git a/templates/plants.html.tera b/templates/plants.html.tera new file mode 100644 index 0000000..0fbeb70 --- /dev/null +++ b/templates/plants.html.tera @@ -0,0 +1,5 @@ +{% extends "nav" %} +{% block content %} +

Plants

+
+{%- endblock %} diff --git a/templates/travel.html.tera b/templates/travel.html.tera new file mode 100644 index 0000000..c6c9581 --- /dev/null +++ b/templates/travel.html.tera @@ -0,0 +1,5 @@ +{% extends "nav" %} +{% block content %} +

Travel

+
+{%- endblock %}