ft/prepares for shuttle launch

2024-05-31 22:35:39 +02:00 · 2024-05-31 22:35:39 +02:00 · b003033ca6
commit b003033ca6
parent 08b0b058f2
61 changed files with 196 additions and 24 deletions
--- a/Cargo.toml
+++ b/Cargo.toml
@ -3,14 +3,9 @@ name = "digitaler-frieden"
 version = "0.1.0"
 edition = "2021"

-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
-web-sys = {version="0.3.69", features = ["HtmlInputElement"]}
-yew = { version = "0.21.0", features = ["csr"] }
-yew-router = { version = "0.18.0"}
-gloo-console = "0.3.0"
-yewdux = "0.10.0"
-serde = "1.0.198"
-serde_json = "1.0.116"
-regex = "1.10.4"
+axum = "0.7.4"
+shuttle-axum = "0.45.0"
+shuttle-runtime = "0.45.0"
+tokio = "1.28.2"
+tower-http = { version = "0.5.2", features = ["fs"] }
--- a/flake.lock
+++ b/flake.lock
@ -49,11 +49,11 @@
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1716517042,
-        "narHash": "sha256-PDPMpBVv+6XdV4FvBWk002IBGofDIWCpo9ewks0kStM=",
+        "lastModified": 1717121863,
+        "narHash": "sha256-/3sxIe7MZqF/jw1RTQCSmgTjwVod43mmrk84m50MJQ4=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "66a43411079d0d1b1b776c0a6ced20a5df896edb",
+        "rev": "2a7b53172ed08f856b8382d7dcfd36a4e0cbd866",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -45,9 +45,9 @@
      # Development environment output
      devShells = forAllSystems ({ pkgs }: {
        default = pkgs.mkShell {
-          # buildInputs = [
-          #   rustup
-          # ];
+          buildInputs = [
+            pkgs.cargo-shuttle
+          ];
          # shellHook = ''
          #   rustup target add wasm32-unknown-unknown
          # '';
--- a/frontend/Cargo.toml
+++ b/frontend/Cargo.toml
@ -0,0 +1,16 @@
+[package]
+name = "digitaler-frieden-frontend"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+web-sys = {version="0.3.69", features = ["HtmlInputElement"]}
+yew = { version = "0.21.0", features = ["csr"] }
+yew-router = { version = "0.18.0"}
+gloo-console = "0.3.0"
+yewdux = "0.10.0"
+serde = "1.0.198"
+serde_json = "1.0.116"
+regex = "1.10.4"
--- a/frontend/Trunk.toml
+++ b/frontend/Trunk.toml
--- a/frontend/assets/Mockup.jpg
+++ b/frontend/assets/Mockup.jpg
--- a/frontend/assets/add.svg
+++ b/frontend/assets/add.svg
--- a/frontend/assets/chat_bubbles.jpg
+++ b/frontend/assets/chat_bubbles.jpg
--- a/frontend/assets/chat_bubbles.png
+++ b/frontend/assets/chat_bubbles.png
--- a/frontend/assets/digitaler-frieden_logo.jpg
+++ b/frontend/assets/digitaler-frieden_logo.jpg
--- a/frontend/assets/digitaler-frieden_logo.svg
+++ b/frontend/assets/digitaler-frieden_logo.svg
--- a/frontend/assets/favicon.ico
+++ b/frontend/assets/favicon.ico
--- a/frontend/assets/icon.png
+++ b/frontend/assets/icon.png
--- a/frontend/assets/icon.svg
+++ b/frontend/assets/icon.svg
--- a/frontend/assets/icon_document_upload.svg
+++ b/frontend/assets/icon_document_upload.svg
--- a/frontend/assets/icon_round.png
+++ b/frontend/assets/icon_round.png
--- a/frontend/assets/icons/chair_magnifier.png
+++ b/frontend/assets/icons/chair_magnifier.png
--- a/frontend/assets/icons/conversation.png
+++ b/frontend/assets/icons/conversation.png
--- a/frontend/assets/icons/financial_growth.png
+++ b/frontend/assets/icons/financial_growth.png
--- a/frontend/assets/icons/icon.jpg
+++ b/frontend/assets/icons/icon.jpg
--- a/frontend/assets/icons/map_search.png
+++ b/frontend/assets/icons/map_search.png
--- a/frontend/assets/icons/message_lookout.png
+++ b/frontend/assets/icons/message_lookout.png
--- a/frontend/assets/icons/office.png
+++ b/frontend/assets/icons/office.png
--- a/frontend/assets/icons/people_cheering.png
+++ b/frontend/assets/icons/people_cheering.png
--- a/frontend/assets/mail.svg
+++ b/frontend/assets/mail.svg
--- a/frontend/assets/paper_plane.svg
+++ b/frontend/assets/paper_plane.svg
--- a/frontend/assets/remove.svg
+++ b/frontend/assets/remove.svg
--- a/frontend/assets/styles.css
+++ b/frontend/assets/styles.css
--- a/frontend/assets/vector-EPS.eps
+++ b/frontend/assets/vector-EPS.eps
--- a/frontend/assets/vector-SVG.svg
+++ b/frontend/assets/vector-SVG.svg
--- a/frontend/dist/digitaler-frieden-frontend-966184f58f0dec130de874bf4a4e9dbea4d2e01aeb5d4c580e786766d8bf5d5d1405401be9a2426f131ac8176ef49da1.js
+++ b/frontend/dist/digitaler-frieden-frontend-966184f58f0dec130de874bf4a4e9dbea4d2e01aeb5d4c580e786766d8bf5d5d1405401be9a2426f131ac8176ef49da1.js
@ -998,7 +998,7 @@ async function __wbg_init(input) {
    if (wasm !== undefined) return wasm;

    if (typeof input === 'undefined') {
-        input = new URL('digitaler-frieden-66f4a2f1dfe699d158fb216baa50f09298585f4829c65922dcdfe4324ea2e6d37b258786aad38b71270f40b7bef9e4d0_bg.wasm', import.meta.url);
+        input = new URL('digitaler-frieden-frontend-966184f58f0dec130de874bf4a4e9dbea4d2e01aeb5d4c580e786766d8bf5d5d1405401be9a2426f131ac8176ef49da1_bg.wasm', import.meta.url);
    }
    const imports = __wbg_get_imports();

--- a/frontend/dist/digitaler-frieden-frontend-966184f58f0dec130de874bf4a4e9dbea4d2e01aeb5d4c580e786766d8bf5d5d1405401be9a2426f131ac8176ef49da1_bg.wasm
+++ b/frontend/dist/digitaler-frieden-frontend-966184f58f0dec130de874bf4a4e9dbea4d2e01aeb5d4c580e786766d8bf5d5d1405401be9a2426f131ac8176ef49da1_bg.wasm
--- a/frontend/dist/favicon-928ba63f33046eed.ico
+++ b/frontend/dist/favicon-928ba63f33046eed.ico
--- a/frontend/dist/index.html
+++ b/frontend/dist/index.html
@ -7,15 +7,15 @@
     
    <link rel="manifest" href="public/manifest.json">
  
-<link rel="preload" href="/digitaler-frieden-66f4a2f1dfe699d158fb216baa50f09298585f4829c65922dcdfe4324ea2e6d37b258786aad38b71270f40b7bef9e4d0_bg.wasm" as="fetch" type="application/wasm" crossorigin="anonymous" integrity="sha384-ZvSi8d_mmdFY-yFrqlDwkphYX0gpxlki3N_kMk6i5tN7JYeGqtOLcScPQLe--eTQ">
-<link rel="modulepreload" href="/digitaler-frieden-66f4a2f1dfe699d158fb216baa50f09298585f4829c65922dcdfe4324ea2e6d37b258786aad38b71270f40b7bef9e4d0.js" crossorigin="anonymous" integrity="sha384-wp6sqTySFAnU_e-tFtq2_-hxFMNiD46wtXFfn9-N_Sucj0pEppfQsGk2x10MkLQC"></head>
+<link rel="preload" href="/digitaler-frieden-frontend-966184f58f0dec130de874bf4a4e9dbea4d2e01aeb5d4c580e786766d8bf5d5d1405401be9a2426f131ac8176ef49da1_bg.wasm" as="fetch" type="application/wasm" crossorigin="anonymous" integrity="sha384-lmGE9Y8N7BMN6HS_Sk6dvqTS4BrrXUxYDnhnZti_XV0UBUAb6aJCbxMayBdu9J2h">
+<link rel="modulepreload" href="/digitaler-frieden-frontend-966184f58f0dec130de874bf4a4e9dbea4d2e01aeb5d4c580e786766d8bf5d5d1405401be9a2426f131ac8176ef49da1.js" crossorigin="anonymous" integrity="sha384-mgpWzZIPoUI4-EYN3fy8ZWDj99XZaUu9aa_xTYGF5civVs-o7hT-Bae1y3GLtLeS"></head>
  <body class="bg-black text-white">
  


 <script type="module">
-import init, * as bindings from '/digitaler-frieden-66f4a2f1dfe699d158fb216baa50f09298585f4829c65922dcdfe4324ea2e6d37b258786aad38b71270f40b7bef9e4d0.js';
-init('/digitaler-frieden-66f4a2f1dfe699d158fb216baa50f09298585f4829c65922dcdfe4324ea2e6d37b258786aad38b71270f40b7bef9e4d0_bg.wasm');
+import init, * as bindings from '/digitaler-frieden-frontend-966184f58f0dec130de874bf4a4e9dbea4d2e01aeb5d4c580e786766d8bf5d5d1405401be9a2426f131ac8176ef49da1.js';
+init('/digitaler-frieden-frontend-966184f58f0dec130de874bf4a4e9dbea4d2e01aeb5d4c580e786766d8bf5d5d1405401be9a2426f131ac8176ef49da1_bg.wasm');
 window.wasmBindings = bindings;

 </script><script>"use strict";
--- a/frontend/dist/public/manifest.json
+++ b/frontend/dist/public/manifest.json
--- a/frontend/dist/public/styles.css
+++ b/frontend/dist/public/styles.css
--- a/frontend/dist/styles-2f497d8ef19829ea.css
+++ b/frontend/dist/styles-2f497d8ef19829ea.css
--- a/frontend/flake.lock
+++ b/frontend/flake.lock
@ -0,0 +1,83 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1705309234,
+        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1706487304,
+        "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "90f456026d284c22b3e3497be980b2e47d0b28ac",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs": [
+          "rust-overlay",
+          "nixpkgs"
+        ],
+        "rust-overlay": "rust-overlay"
+      }
+    },
+    "rust-overlay": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1716517042,
+        "narHash": "sha256-PDPMpBVv+6XdV4FvBWk002IBGofDIWCpo9ewks0kStM=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "66a43411079d0d1b1b776c0a6ced20a5df896edb",
+        "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
+}
--- a/frontend/flake.nix
+++ b/frontend/flake.nix
@ -0,0 +1,67 @@
+{
+  description = "Example Rust development environment for Zero to Nix";
+
+  # Flake inputs
+  inputs = {
+    # nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/*.tar.gz";
+    rust-overlay.url = "github:oxalica/rust-overlay"; # A helper for Rust + Nix
+    # cargo2nix.url = "github:cargo2nix/cargo2nix/";
+    nixpkgs.follows = "rust-overlay/nixpkgs";
+  };
+
+  # Flake outputs
+  outputs = { self, nixpkgs, rust-overlay}:
+    let
+      # Overlays enable you to customize the Nixpkgs attribute set
+      overlays = [
+        # Makes a `rust-bin` attribute available in Nixpkgs
+        (import rust-overlay)
+        # Provides a `rustToolchain` attribute for Nixpkgs that we can use to
+        # create a Rust environment
+        (self: super: {
+          rustToolchain = super.rust-bin.stable.latest.default;
+        })
+      ];
+
+      # Systems supported
+      allSystems = [
+        "x86_64-linux" # 64-bit Intel/AMD Linux
+        "aarch64-linux" # 64-bit ARM Linux
+        "x86_64-darwin" # 64-bit Intel macOS
+        "aarch64-darwin" # 64-bit ARM macOS
+      ];
+
+      # rustTarget = nixpkgs.pkgs.rust-bin.selectLatestNightlyWith (toolchain: toolchain.default.override {
+      #       extensions = [ "rust-src" "rustup" "rust-analyzer" "rust-std" ];
+      #       targets = [ "x86_64-unknown-linux-gnu" "wasm32-unknown-unknown" ];
+      #     });
+
+      # Helper to provide system-specific attributes
+      forAllSystems = f: nixpkgs.lib.genAttrs allSystems (system: f {
+        pkgs = import nixpkgs { inherit overlays system; };
+      });
+    in
+    {
+      # Development environment output
+      devShells = forAllSystems ({ pkgs }: {
+        default = pkgs.mkShell {
+          # buildInputs = [
+          #   rustup
+          # ];
+          # shellHook = ''
+          #   rustup target add wasm32-unknown-unknown
+          # '';
+          # The Nix packages provided in the environment
+          packages = (with pkgs; [
+            # The package provided by our custom overlay. Includes cargo, Clippy, cargo-fmt,
+            # rustdoc, rustfmt, and other tools.
+            rust-analyzer
+            clippy
+            trunk
+            tailwindcss
+            rustToolchain
+          ]) ++ pkgs.lib.optionals pkgs.stdenv.isDarwin (with pkgs; [ libiconv ]);
+        };
+      });
+    };
+}
--- a/frontend/index.html
+++ b/frontend/index.html
--- a/frontend/input.css
+++ b/frontend/input.css
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
--- a/frontend/package.json
+++ b/frontend/package.json
--- a/frontend/public/manifest.json
+++ b/frontend/public/manifest.json
--- a/frontend/public/styles.css
+++ b/frontend/public/styles.css
--- a/frontend/src/lib.rs
+++ b/frontend/src/lib.rs
--- a/frontend/src/main.rs
+++ b/frontend/src/main.rs
@ -0,0 +1,5 @@
+use digitaler_frieden_frontend::router::Main;
+
+fn main() {
+    yew::Renderer::<Main>::new().render();
+}
--- a/frontend/src/pages.rs
+++ b/frontend/src/pages.rs
--- a/frontend/src/pages/clues.rs
+++ b/frontend/src/pages/clues.rs
--- a/frontend/src/pages/deceased.rs
+++ b/frontend/src/pages/deceased.rs
--- a/frontend/src/pages/documents.rs
+++ b/frontend/src/pages/documents.rs
--- a/frontend/src/pages/home.rs
+++ b/frontend/src/pages/home.rs
--- a/frontend/src/pages/register.rs
+++ b/frontend/src/pages/register.rs
--- a/frontend/src/pages/relationship.rs
+++ b/frontend/src/pages/relationship.rs
--- a/frontend/src/pages/signup.rs
+++ b/frontend/src/pages/signup.rs
--- a/frontend/src/pages/verify.rs
+++ b/frontend/src/pages/verify.rs
--- a/frontend/src/router.rs
+++ b/frontend/src/router.rs
--- a/frontend/src/storage.rs
+++ b/frontend/src/storage.rs
--- a/frontend/src/validation.rs
+++ b/frontend/src/validation.rs
--- a/frontend/tailwind.config.js
+++ b/frontend/tailwind.config.js
--- a/src/main.rs
+++ b/src/main.rs
@ -1,5 +1,11 @@
-use digitaler_frieden::router::Main;
+use axum::Router;
+use tower_http::services::ServeDir;

-fn main() {
-    yew::Renderer::<Main>::new().render();
+#[shuttle_runtime::main]
+async fn main() -> shuttle_axum::ShuttleAxum {
+    let router = Router::new()
+        // .route("/", get(hello_world))
+        .nest_service("/", ServeDir::new("frontend/dist"));
+
+    Ok(router.into())
 }