diff --git a/.github/workflows/deploy-cursed-graphics.yml b/.github/workflows/deploy-cursed-graphics.yml new file mode 100644 index 0000000..cdd80b9 --- /dev/null +++ b/.github/workflows/deploy-cursed-graphics.yml @@ -0,0 +1,35 @@ +name: Deploy cursed.graphics + +on: + push: + branches: + - master + paths: + - 'sites/cursed.graphics/**' + +jobs: + deploy: + name: Production Deployment + runs-on: ubuntu-latest + environment: production + permissions: + contents: read + deployments: write + + steps: + - name: Checkout master + uses: actions/checkout@v4 + + - name: Ensure Cargo is installed + uses: actions-rs/toolchain@v1 + with: + toolchain: stable + + - name: Build Edge Worker + uses: cloudflare/wrangler-action@v3 + with: + apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} + accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} + gitHubToken: ${{ secrets.GITHUB_TOKEN }} + environment: production + workingDirectory: sites/cursed.graphics diff --git a/CODEOWNERS b/CODEOWNERS index fd81cee..cbba551 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,2 +1,5 @@ # Global owners * @ewpratten + +# Projects +sites/cursed.graphics/* @ewpratten @exvacuum @hyperliskdev @percyx42 @demilurii \ No newline at end of file diff --git a/config.toml b/config.toml index 6a2b0ac..a594dc6 100644 --- a/config.toml +++ b/config.toml @@ -7,8 +7,8 @@ build_search_index = true generate_feeds = true feed_filenames = ["rss.xml"] minify_html = false # This breaks mermaid diagrams :( -ignored_content = ["content/@/blog/*.md"] -ignored_static = ["static/images/drawings/*/*.xcf"] +ignored_content = ["content/@/blog/*.md", "sites/"] +ignored_static = ["static/images/drawings/*/*.xcf", "sites/"] [markdown] highlight_code = true diff --git a/sites/README.txt b/sites/README.txt new file mode 100644 index 0000000..6035089 --- /dev/null +++ b/sites/README.txt @@ -0,0 +1,2 @@ +This is the new area for storing site SRCs. +The main website shall move here soon. \ No newline at end of file diff --git a/sites/cursed.graphics/.gitignore b/sites/cursed.graphics/.gitignore new file mode 100644 index 0000000..929da4f --- /dev/null +++ b/sites/cursed.graphics/.gitignore @@ -0,0 +1,26 @@ +# Generated by Cargo +# will have compiled files and executables +debug/ +target/ + +# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries +# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html +Cargo.lock + +# These are backup files generated by rustfmt +**/*.rs.bk + +# MSVC Windows builds of rustc generate these, which store debugging information +*.pdb + +# RustRover +# JetBrains specific template is maintained in a separate JetBrains.gitignore that can +# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore +# and can be added to the global gitignore or merged into this file. For a more nuclear +# option (not recommended) you can uncomment the following to ignore the entire idea folder. +#.idea/ + +# Node +/build +/node_modules +/.wrangler \ No newline at end of file diff --git a/sites/cursed.graphics/Cargo.toml b/sites/cursed.graphics/Cargo.toml new file mode 100644 index 0000000..1b07eaa --- /dev/null +++ b/sites/cursed.graphics/Cargo.toml @@ -0,0 +1,18 @@ +[package] +name = "cursed-graphics" +publish = false +edition = "2021" + +[dependencies] +getrandom = { version = "0.2.15", features = ["js"] } +worker = "0.4.2" +worker-macros = "0.4.2" +console_error_panic_hook = "0.1.7" +rand = "0.8.5" +base64 = "0.22.1" + +[package.metadata.wasm-pack.profile.release] +wasm-opt = false + +[lib] +crate-type = ["cdylib"] diff --git a/sites/cursed.graphics/src/lib.rs b/sites/cursed.graphics/src/lib.rs new file mode 100644 index 0000000..f9d4acb --- /dev/null +++ b/sites/cursed.graphics/src/lib.rs @@ -0,0 +1,70 @@ +use worker::*; + +#[event(fetch)] +async fn fetch(request: Request, env: Env, _context: Context) -> Result { + console_error_panic_hook::set_once(); + + // Split the path into segments + let url = request.url().unwrap(); + let path_segments = url.path_segments(); + + // Handle the sub-paths + match path_segments { + Some(path_segments) => match path_segments.collect::>().as_slice() { + // Index + [""] => Response::from_html(include_str!("../templates/index.html")), + + // Randomizer + ["random"] => { + // List the images in the bucket + let images = env.bucket("IMAGES")?.list().execute().await?.objects(); + + // If there's a referer header, make note of the previous image + let previous_image = request.headers().get("Referer")?.map(|referer| { + let referer = referer.split("/").last().unwrap(); + referer.to_string() + }); + + // Pick a random file name. Don't pick the same one as the previous image + let images = images.iter().filter(|image| { + let image_id = image.key().split(".").next().unwrap().to_string(); + previous_image != Some(image_id) + }).collect::>(); + let random_index = rand::random::() % images.len(); + let random_image = images.get(random_index).unwrap().key(); + let random_image = random_image.split(".").next().unwrap(); + + Response::builder() + .with_status(302) + .with_header("Location", &format!("/{}", random_image))? + .ok("") + } + + // Image subpage (addressed by numeric ID) + [id] => { + // List the images in the bucket + let images = env.bucket("IMAGES")?.list().execute().await?.objects(); + + // Find the first one with a matching name + let image = images.iter().find(|image| { + image.key().split(".").next().unwrap() == *id + }); + + // If no result is found, this image doesn't exist + if image.is_none() { + return Response::error("Not Found", 404); + } + + // Serve the image + Response::from_html(format!( + include_str!("../templates/image.html"), + image_id = id, + image_filename = image.unwrap().key() + )) + } + + _ => Response::error("Not Found", 404), + }, + _ => Response::error("Not Found", 404), + } +} diff --git a/sites/cursed.graphics/templates/image.html b/sites/cursed.graphics/templates/image.html new file mode 100644 index 0000000..30ad473 --- /dev/null +++ b/sites/cursed.graphics/templates/image.html @@ -0,0 +1,54 @@ + + + + + + Cursed Graphics: {image_id} + + + + + + + + + + + + + + + + +
+ {image_id} + More +
+ + + + \ No newline at end of file diff --git a/sites/cursed.graphics/templates/index.html b/sites/cursed.graphics/templates/index.html new file mode 100644 index 0000000..0bf4828 --- /dev/null +++ b/sites/cursed.graphics/templates/index.html @@ -0,0 +1,45 @@ + + + + + + + Cursed Graphics + + + + + + + + + + +
+

Cursed Graphics

+ Show Me +
+ + + \ No newline at end of file diff --git a/sites/cursed.graphics/wrangler.toml b/sites/cursed.graphics/wrangler.toml new file mode 100644 index 0000000..dd842ff --- /dev/null +++ b/sites/cursed.graphics/wrangler.toml @@ -0,0 +1,11 @@ +name = "cursed-graphics" +main = "build/worker/shim.mjs" +compatibility_date = "2024-11-23" + +[[r2_buckets]] +binding = "IMAGES" +bucket_name = "cursed-graphics" +preview_bucket_name = "cursed-graphics" + +[build] +command = "cargo install worker-build && worker-build --release"