logan/website
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Added fishbowl page

Browse source
This commit is contained in:
Logan 2024-09-04 21:19:28 -05:00
parent beab033fd7
commit 1c9d5e15d7
10 changed files with 654 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
dist/favicon.ico vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 235 KiB

BIN
dist/favicon.jpg vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 27 KiB

37
dist/index.html vendored
View file

@ -193,9 +193,9 @@ select { /* 1 */
*/
button,
[type="button"],
[type="reset"],
[type="submit"] {
[type="button"],
[type="reset"],
[type="submit"] {
-webkit-appearance: button;
}
@ -204,9 +204,9 @@ button,
*/
button::-moz-focus-inner,
[type="button"]::-moz-focus-inner,
[type="reset"]::-moz-focus-inner,
[type="submit"]::-moz-focus-inner {
[type="button"]::-moz-focus-inner,
[type="reset"]::-moz-focus-inner,
[type="submit"]::-moz-focus-inner {
border-style: none;
padding: 0;
}
@ -216,9 +216,9 @@ button::-moz-focus-inner,
*/
button:-moz-focusring,
[type="button"]:-moz-focusring,
[type="reset"]:-moz-focusring,
[type="submit"]:-moz-focusring {
[type="button"]:-moz-focusring,
[type="reset"]:-moz-focusring,
[type="submit"]:-moz-focusring {
outline: 1px dotted ButtonText;
}
@ -267,8 +267,8 @@ textarea {
* 2. Remove the padding in IE 10.
*/
[type="checkbox"],
[type="radio"] {
[type="checkbox"],
[type="radio"] {
box-sizing: border-box; /* 1 */
padding: 0; /* 2 */
}
@ -277,8 +277,8 @@ textarea {
* Correct the cursor style of increment and decrement buttons in Chrome.
*/
[type="number"]::-webkit-inner-spin-button,
[type="number"]::-webkit-outer-spin-button {
[type="number"]::-webkit-inner-spin-button,
[type="number"]::-webkit-outer-spin-button {
height: auto;
}
@ -287,7 +287,7 @@ textarea {
* 2. Correct the outline style in Safari.
*/
[type="search"] {
[type="search"] {
-webkit-appearance: textfield; /* 1 */
outline-offset: -2px; /* 2 */
}
@ -296,7 +296,7 @@ textarea {
* Remove the inner padding in Chrome and Safari on macOS.
*/
[type="search"]::-webkit-search-decoration {
[type="search"]::-webkit-search-decoration {
-webkit-appearance: none;
}
@ -348,7 +348,8 @@ template {
display: none;
}
</style><style>@font-face {
@font-face {
font-family: 'merriweather';
src: url(/res/merriweather-regular.woff2);
}
@ -419,7 +420,7 @@ code {
text-align: center;
}
.twocols{
.twocols {
display: inline-block;
columns: 2;
text-align: left;
@ -483,4 +484,4 @@ h1,h2 {
I am currently in the process of migrating my git repositories
and portfolio to be entirely self hosted. Some features and
integrations are still a work in progress. Fishbowl will return soon!
</div><div class="half"><h2>portfolio</h2><ul><li><a href="https://git.lgatlin.dev/">my git server</a></li><li><a href="https://git.lgatlin.dev/logan/http-server">http web server</a></li><li><a href="https://git.lgatlin.dev/logan/html-templater">html templating language</a></li><li><a href="https://git.lgatlin.dev/logan/fishbowl">kinematic image processing</a></li><li><a href="https://git.lgatlin.dev/logan/forte">stack based assembly language</a></li><li><a href="https://git.lgatlin.dev/logan/nrange">n dimensional cartesian product</a></li><li><a href="https://git.lgatlin.dev/logan/stocks">stock trading algorithm</a></li></ul></div></div></main></div></body></html>
</div><div class="half"><h2>portfolio</h2><ul><li><a href="https://git.lgatlin.dev/logan">my git server</a></li><li><a href="https://git.lgatlin.dev/logan/http-server">http web server</a></li><li><a href="https://git.lgatlin.dev/logan/html-templater">html templating language</a></li><li><a href="https://git.lgatlin.dev/logan/fishbowl">kinematic image processing</a></li><li><a href="https://git.lgatlin.dev/logan/forte">stack based assembly language</a></li><li><a href="https://git.lgatlin.dev/logan/nrange">n dimensional cartesian product</a></li><li><a href="https://git.lgatlin.dev/logan/stocks">stock trading algorithm</a></li></ul></div></div></main></div></body></html>

498
dist/projects/fishbowl.html vendored Normal file
View file

@ -0,0 +1,498 @@
<!DOCTYPE html><html><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta http-equiv="X-UA-Compatible" content="ie=edge"><title>logan's site</title><style>/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */
/* Document
========================================================================== */
/**
* 1. Correct the line height in all browsers.
* 2. Prevent adjustments of font size after orientation changes in iOS.
*/
html {
line-height: 1.15; /* 1 */
-webkit-text-size-adjust: 100%; /* 2 */
}
/* Sections
========================================================================== */
/**
* Remove the margin in all browsers.
*/
body {
margin: 0;
}
/**
* Render the `main` element consistently in IE.
*/
main {
display: block;
}
/**
* Correct the font size and margin on `h1` elements within `section` and
* `article` contexts in Chrome, Firefox, and Safari.
*/
h1 {
font-size: 2em;
margin: 0.67em 0;
}
/* Grouping content
========================================================================== */
/**
* 1. Add the correct box sizing in Firefox.
* 2. Show the overflow in Edge and IE.
*/
hr {
box-sizing: content-box; /* 1 */
height: 0; /* 1 */
overflow: visible; /* 2 */
}
/**
* 1. Correct the inheritance and scaling of font size in all browsers.
* 2. Correct the odd `em` font sizing in all browsers.
*/
pre {
font-family: monospace, monospace; /* 1 */
font-size: 1em; /* 2 */
}
/* Text-level semantics
========================================================================== */
/**
* Remove the gray background on active links in IE 10.
*/
a {
background-color: transparent;
}
/**
* 1. Remove the bottom border in Chrome 57-
* 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
*/
abbr[title] {
border-bottom: none; /* 1 */
text-decoration: underline; /* 2 */
text-decoration: underline dotted; /* 2 */
}
/**
* Add the correct font weight in Chrome, Edge, and Safari.
*/
b,
strong {
font-weight: bolder;
}
/**
* 1. Correct the inheritance and scaling of font size in all browsers.
* 2. Correct the odd `em` font sizing in all browsers.
*/
code,
kbd,
samp {
font-family: monospace, monospace; /* 1 */
font-size: 1em; /* 2 */
}
/**
* 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;
}
/* Embedded content
========================================================================== */
/**
* Remove the border on images inside links in IE 10.
*/
img {
border-style: none;
}
/* Forms
========================================================================== */
/**
* 1. Change the font styles in all browsers.
* 2. Remove the margin in Firefox and Safari.
*/
button,
input,
optgroup,
select,
textarea {
font-family: inherit; /* 1 */
font-size: 100%; /* 1 */
line-height: 1.15; /* 1 */
margin: 0; /* 2 */
}
/**
* Show the overflow in IE.
* 1. Show the overflow in Edge.
*/
button,
input { /* 1 */
overflow: visible;
}
/**
* Remove the inheritance of text transform in Edge, Firefox, and IE.
* 1. Remove the inheritance of text transform in Firefox.
*/
button,
select { /* 1 */
text-transform: none;
}
/**
* Correct the inability to style clickable types in iOS and Safari.
*/
button,
[type="button"],
[type="reset"],
[type="submit"] {
-webkit-appearance: button;
}
/**
* Remove the inner border and padding in Firefox.
*/
button::-moz-focus-inner,
[type="button"]::-moz-focus-inner,
[type="reset"]::-moz-focus-inner,
[type="submit"]::-moz-focus-inner {
border-style: none;
padding: 0;
}
/**
* Restore the focus styles unset by the previous rule.
*/
button:-moz-focusring,
[type="button"]:-moz-focusring,
[type="reset"]:-moz-focusring,
[type="submit"]:-moz-focusring {
outline: 1px dotted ButtonText;
}
/**
* Correct the padding in Firefox.
*/
fieldset {
padding: 0.35em 0.75em 0.625em;
}
/**
* 1. Correct the text wrapping in Edge and IE.
* 2. Correct the color inheritance from `fieldset` elements in IE.
* 3. Remove the padding so developers are not caught out when they zero out
* `fieldset` elements in all browsers.
*/
legend {
box-sizing: border-box; /* 1 */
color: inherit; /* 2 */
display: table; /* 1 */
max-width: 100%; /* 1 */
padding: 0; /* 3 */
white-space: normal; /* 1 */
}
/**
* Add the correct vertical alignment in Chrome, Firefox, and Opera.
*/
progress {
vertical-align: baseline;
}
/**
* Remove the default vertical scrollbar in IE 10+.
*/
textarea {
overflow: auto;
}
/**
* 1. Add the correct box sizing in IE 10.
* 2. Remove the padding in IE 10.
*/
[type="checkbox"],
[type="radio"] {
box-sizing: border-box; /* 1 */
padding: 0; /* 2 */
}
/**
* Correct the cursor style of increment and decrement buttons in Chrome.
*/
[type="number"]::-webkit-inner-spin-button,
[type="number"]::-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.
*/
[type="search"]::-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 */
}
/* Interactive
========================================================================== */
/*
* Add the correct display in Edge, IE 10+, and Firefox.
*/
details {
display: block;
}
/*
* Add the correct display in all browsers.
*/
summary {
display: list-item;
}
/* Misc
========================================================================== */
/**
* Add the correct display in IE 10+.
*/
template {
display: none;
}
/**
* Add the correct display in IE 10.
*/
[hidden] {
display: none;
}
@font-face {
font-family: 'merriweather';
src: url(/res/merriweather-regular.woff2);
}
@font-face {
font-family: 'cascadia';
src: url(/res/cascadiacode.woff2);
}
body {
font-family: merriweather;
background-image: url("/res/grey.png");
background-repeat: repeat;
height: 100%;
padding: 5px;
line-height: 1.75em;
}
.container {
max-width: 1000px;
}
.tile {
border-radius: 15px;
padding: 15px;
background-color: #ffeedd;
margin: 2px;
width: 100%
}
.third {
padding-left: 5px;
padding-right: 5px;
flex: 30%;
}
.half {
padding-left: 15px;
padding-right: 15px;
flex: 50%;
}
.bg {
width: 100%;
height: 100%;
display: block;
position: fixed;
top: 0;
left: 0;
z-index: -9999;
}
code {
font-family: cascadia;
}
.monospace {
font-family: cascadia;
align-content: center;
}
.flex {
display: flex;
margin: auto;
}
.text_center {
text-align: center;
}
.twocols {
display: inline-block;
columns: 2;
text-align: left;
-webkit-columns: 2;
-moz-columns: 2;
}
table {
margin-left: auto;
margin-right: auto;
}
table, th, td {
padding: 5px;
border: 3px solid black;
border-style: solid;
border-collapse: collapse;
/* text-align: center; */
align-content: center;
}
a {
color: #df3e23;
font-style: italic;
text-decoration: none;
}
a:visited {
color: #df3e23;
font-style: italic;
text-decoration: none;
}
a:before {
content: "[";
font-style: normal;
color: black;
}
a:after {
content: "]";
font-style: normal;
color: black;
}
h1,h2 {
text-align: center;
}
</style></head><body><div class="container flex"><main class="tile big"><h1>fishbowl</h1><p>
Choose an image and click submit. The image will be sent and processed by
my server, so be mindful of what you submit. No logs or copies of the
input are preserved.
</p><form id="fishForm"><label for="file">Select an image:</label><br><input id="fishFile" accept="image/*" name="image" type="file"><br><input value="Run Fishbowl" type="submit"></form><br><img id="fishImage" width="480" height="480"><script>const form = document.getElementById("fishForm");
const image = document.getElementById("fishImage");
form.onsubmit = async (ev) => {
ev.preventDefault();
image.src = "";
try {
const file = document.getElementById("fishFile").files[0];
const arrayBuf = await file.arrayBuffer();
const response = await fetch("/api/fishbowl", {
method: 'POST',
body: arrayBuf,
});
const blob = await response.blob();
image.src = URL.createObjectURL(blob);
} catch (error) {
console.log(error);
}
}
</script></main></div></body></html>

20
src/fishbowl.js Normal file
View file

@ -0,0 +1,20 @@
const form = document.getElementById("fishForm");
const image = document.getElementById("fishImage");
form.onsubmit = async (ev) => {
ev.preventDefault();
image.src = "";
try {
const file = document.getElementById("fishFile").files[0];
const arrayBuf = await file.arrayBuffer();
const response = await fetch("/api/fishbowl", {
method: 'POST',
body: arrayBuf,
});
const blob = await response.blob();
image.src = URL.createObjectURL(blob);
} catch (error) {
console.log(error);
}
}

64
src/homepage.rs Normal file
View file

@ -0,0 +1,64 @@
use crate::*;
fn prow(name: &str, desc: &str, _date: &str, link: &str) -> Markup {
html! {
tr {
td { a href=(link) { (name) } }
td { (desc) }
}
}
}
pub fn index() -> Markup {
template(html! {
h1 {"logan's site"}
hr;
div .flex {
div .half {
h2 {"me"}
"
I am a programming and philosophy
enthusiast. Once upon a time i was a
competitive debater on a few local and
state circuits. After over 10 years of
doing robotics I'm finally starting to
get the hang of it. Currently in the
process of discovering my love for
hypertext and the world wide web!
"
h2 {"migration"}
"
I am currently in the process of migrating my git repositories
and portfolio to be entirely self hosted. Some features and
integrations are still a work in progress. Fishbowl will return soon!
"
}
div .half {
h2 {"portfolio"}
ul {
li {
a href="https://git.lgatlin.dev/logan" { "my git server" }
}
li {
a href="https://git.lgatlin.dev/logan/http-server" { "http web server" }
}
li {
a href="https://git.lgatlin.dev/logan/html-templater" { "html templating language" }
}
li {
a href="https://git.lgatlin.dev/logan/fishbowl" { "kinematic image processing" }
}
li {
a href="https://git.lgatlin.dev/logan/forte" { "stack based assembly language" }
}
li {
a href="https://git.lgatlin.dev/logan/nrange" { "n dimensional cartesian product" }
}
li {
a href="https://git.lgatlin.dev/logan/stocks" { "stock trading algorithm" }
}
}
}
}
})
}

0
src/index.js
View file

2
src/main.css
View file

@ -69,7 +69,7 @@ code {
text-align: center;
}
.twocols{
.twocols {
display: inline-block;
columns: 2;
text-align: left;

75
src/main.rs
View file

@ -1,9 +1,9 @@
mod homepage;
mod projects;
use maud::*;
use std::fs::File;
use std::io::prelude::*;
use sysinfo::*;
const MB: u64 = 1048576;
fn head() -> Markup {
html! {
@ -12,8 +12,11 @@ fn head() -> Markup {
meta name="viewport" content="width=device-width, initial-scale=1.0";
meta http-equiv="X-UA-Compatible" content="ie=edge";
title { "logan's site" };
style { (include_str!("normalize.css")) }
style { (PreEscaped(include_str!("main.css"))) }
style {
(PreEscaped(include_str!("normalize.css")))
"\n"
(PreEscaped(include_str!("main.css")))
}
}
}
}
@ -24,73 +27,19 @@ fn template(inner: Markup) -> Markup {
html {
(head())
body {
div .container .flex {
main .tile .big {
(inner)
}
}
}
}
fn prow(name: &str, desc: &str, date: &str, link: &str) -> Markup {
html! {
tr {
td { a href=(link) { (name) } }
td { (desc) }
}
}
}
fn index() -> Markup {
let mut sys = System::new_all();
let system_name = System::name().unwrap();
let used_mem = sys.used_memory() / MB;
let total_mem = sys.total_memory() / MB;
let load_avg = System::load_average();
sys.refresh_all();
template(html! {
div .container .flex {
main .tile .big {
h1 {"logan's site"}
hr;
div .flex {
div .half {
h2 {"me"}
"
I am a programming and philosophy
enthusiast. Once upon a time i was a
competitive debater on a few local and
state circuits. After over 10 years of
doing robotics I'm finally starting to
get the hang of it. Currently in the
process of discovering my love for
hypertext and the world wide web!
"
h2 {"migration"}
"
I am currently in the process of migrating my git repositories
and portfolio to be entirely self hosted. Some features and
integrations are still a work in progress. Fishbowl will return soon!
"
}
div .half {
h2 {"portfolio"}
ul {
li { a href="https://git.lgatlin.dev/" { "my git server" } }
li { a href="https://git.lgatlin.dev/logan/http-server" { "http web server" } }
li { a href="https://git.lgatlin.dev/logan/html-templater" { "html templating language" } }
li { a href="https://git.lgatlin.dev/logan/fishbowl" { "kinematic image processing" } }
li { a href="https://git.lgatlin.dev/logan/forte" { "stack based assembly language" }}
li { a href="https://git.lgatlin.dev/logan/nrange" { "n dimensional cartesian product" }}
li { a href="https://git.lgatlin.dev/logan/stocks" { "stock trading algorithm" }}
}
}
}
}
}
})
}
fn main() -> std::io::Result<()> {
make_page("index", index())?;
make_page("index", homepage::index())?;
make_page("projects/fishbowl", projects::fishbowl())?;
Ok(())
}

26
src/projects.rs Normal file
View file

@ -0,0 +1,26 @@
use crate::*;
pub fn fishbowl() -> Markup {
template(html! {
h1 {"fishbowl"}
p {
"
Choose an image and click submit. The image will be sent and processed by
my server, so be mindful of what you submit. No logs or copies of the
input are preserved.
"
}
form #fishForm {
label for="file" {"Select an image:"}
br;
input #fishFile accept="image/*" name="image" type="file";
br;
input value="Run Fishbowl" type="submit";
}
br;
img #fishImage width="480" height="480";
script {
(PreEscaped(include_str!("fishbowl.js")))
}
})
}