.envrc

@@ -1 +0,0 @@
-use flake

.gitignore

@@ -1,4 +1 @@
 /target
-/static
-/result
-.direnv

Cargo.toml

@@ -1,7 +1,8 @@
-[workspace]
+[package]
-	members = ["app", "server"]
+	edition = "2024"
-	resolver = "3"
+	name = "website"
+	version = "0.1.0"
 
-[profile.release]
+[dependencies]
-	lto = "thin"
+	axum = "0.8"
-	opt-level = 'z'
+	tokio = { version = "1", features = ["full"] }

Dockerfile

@@ -1,21 +1,15 @@
 FROM rust:1 AS builder
 WORKDIR /usr/src/website
 COPY . .
-
+RUN cargo install --path .
-RUN rustup target add wasm32-unknown-unknown
-RUN cargo install wasm-bindgen-cli
-
-RUN ./build-wasm.sh
-RUN cargo build --release -p server
 
 FROM debian:trixie-slim
 RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates curl && rm -rf /var/lib/apt/lists/*
-COPY --from=builder /usr/src/website/target/release/server /usr/local/bin/server
+COPY --from=builder /usr/local/cargo/bin/website /usr/local/bin/website
-COPY --from=builder /usr/src/website/static /app/static
 
-WORKDIR /app
 EXPOSE 3000
 HEALTHCHECK --interval=30s --timeout=5s --start-period=5s --retries=3 \
-    CMD curl -f http://localhost:3000/health || exit 1
+    CMD curl -f http://localhost:3000/ || exit 1
+
+CMD ["website"]
 
-CMD ["server"]

app/Cargo.toml

@@ -1,12 +0,0 @@
-[package]
-	edition = "2024"
-	name = "app"
-	version = "0.1.0"
-
-[dependencies]
-	bevy = { version = "0.18", default-features = false, features = [
-		"3d",
-		"tonemapping_luts",
-		"web",
-		"webgl2",
-	] }

app/src/main.rs

@@ -1,47 +0,0 @@
-use bevy::prelude::*;
-
-fn main() {
-    App::new()
-        .add_plugins(DefaultPlugins.set(WindowPlugin {
-            primary_window: Some(Window {
-                fit_canvas_to_parent: true,
-                prevent_default_event_handling: false,
-                canvas: Some("#bevy-canvas".into()),
-                ..default()
-            }),
-            ..default()
-        }))
-        .add_systems(Startup, setup)
-        .run();
-}
-
-fn setup(
-    mut commands: Commands,
-    mut meshes: ResMut<Assets<Mesh>>,
-    mut materials: ResMut<Assets<StandardMaterial>>,
-) {
-    commands.spawn((
-        Mesh3d(meshes.add(Circle::new(4.0))),
-        MeshMaterial3d(materials.add(Color::WHITE)),
-        Transform::from_rotation(Quat::from_rotation_x(-std::f32::consts::FRAC_PI_2)),
-    ));
-
-    commands.spawn((
-        Mesh3d(meshes.add(Cuboid::new(1.0, 1.0, 1.0))),
-        MeshMaterial3d(materials.add(Color::srgb_u8(124, 144, 255))),
-        Transform::from_xyz(0.0, 0.5, 0.0),
-    ));
-
-    commands.spawn((
-        PointLight {
-            shadows_enabled: true,
-            ..default()
-        },
-        Transform::from_xyz(4.0, 8.0, 4.0),
-    ));
-
-    commands.spawn((
-        Camera3d::default(),
-        Transform::from_xyz(-2.5, 4.5, 9.0).looking_at(Vec3::ZERO, Vec3::Y),
-    ));
-}

build-wasm.sh

@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-PROFILE="${1:-release}"
-
-if [ "$PROFILE" = "dev" ]; then
-    PROFILE_DIR="debug"
-    CARGO_FLAGS=""
-else
-    PROFILE_DIR="release"
-    CARGO_FLAGS="--release"
-fi
-
-cargo build $CARGO_FLAGS --target wasm32-unknown-unknown -p app
-
-mkdir -p static
-wasm-bindgen --out-name 3dscene \
-    --out-dir static \
-    --target web \
-    "target/wasm32-unknown-unknown/$PROFILE_DIR/app.wasm"
-cp web/index.html static/

flake.lock

@@ -1,82 +0,0 @@
-{
-  "nodes": {
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1771369470,
-        "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "0182a361324364ae3f436a63005877674cf45efb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs",
-        "rust-overlay": "rust-overlay"
-      }
-    },
-    "rust-overlay": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1771556776,
-        "narHash": "sha256-zKprqMQDl3xVfhSSYvgru1IGXjFdxryWk+KqK0I20Xk=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "8b3f46b8a6d17ab46e533a5e3d5b1cc2ff228860",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}

flake.nix

@@ -1,42 +0,0 @@
-{
-  description = "Bevy WASM website";
-
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    rust-overlay = {
-      url = "github:oxalica/rust-overlay";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    flake-utils.url = "github:numtide/flake-utils";
-  };
-
-  outputs =
-    {
-      self,
-      nixpkgs,
-      rust-overlay,
-      flake-utils,
-      ...
-    }:
-    flake-utils.lib.eachDefaultSystem (
-      system:
-      let
-        overlays = [ (import rust-overlay) ];
-        pkgs = import nixpkgs {
-          inherit system overlays;
-        };
-        rustToolchain = pkgs.rust-bin.stable.latest.default.override {
-          extensions = [ "rust-src" ];
-          targets = [ "wasm32-unknown-unknown" ];
-        };
-      in
-      {
-        devShells.default = pkgs.mkShell {
-          buildInputs = [
-            rustToolchain
-            pkgs.wasm-bindgen-cli
-          ];
-        };
-      }
-    );
-}

server/Cargo.toml

@@ -1,9 +0,0 @@
-[package]
-	edition = "2024"
-	name = "server"
-	version = "0.1.0"
-
-[dependencies]
-	axum = "0.8"
-	tokio = { version = "1", features = ["full"] }
-	tower-http = { version = "0.6", features = ["fs"] }

src/main.rs

@@ -1,12 +1,11 @@
 use axum::{Router, routing::get};
-use tower_http::services::ServeDir;
 
 #[tokio::main]
 async fn main() {
-    let app = Router::new()
+    // build our application with a single route
-        .route("/health", get(|| async { "OK" }))
+    let app = Router::new().route("/", get(|| async { "Hello, World!" }));
-        .fallback_service(ServeDir::new("static"));
 
+    // run our app with hyper, listening globally on port 3000
     println!("Listening on http://0.0.0.0:3000");
     let listener = tokio::net::TcpListener::bind("0.0.0.0:3000").await.unwrap();
     axum::serve(listener, app).await.unwrap();

web/index.html

@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>3D Scene</title>
-    <style>
-        html,
-        body {
-            margin: 0;
-            padding: 0;
-            width: 100%;
-            height: 100%;
-            overflow: hidden;
-            background: #1a1a2e;
-        }
-
-        canvas {
-            width: 100%;
-            height: 100%;
-            display: block;
-        }
-    </style>
-</head>
-
-<body>
-    <canvas id="bevy-canvas"></canvas>
-    <script type="module">
-        import init from './3dscene.js';
-        init();
-    </script>
-</body>
-
-</html>