diff --git a/Cargo.toml b/Cargo.toml index e1d9200..f5ed5f4 100644 --- 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"] } diff --git a/flake.lock b/flake.lock index 5b88c1e..6b0c708 100644 --- 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": { diff --git a/flake.nix b/flake.nix index 4580c06..53359a2 100644 --- 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 # ''; diff --git a/frontend/Cargo.toml b/frontend/Cargo.toml new file mode 100644 index 0000000..ec7591f --- /dev/null +++ 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" diff --git a/Trunk.toml b/frontend/Trunk.toml similarity index 100% rename from Trunk.toml rename to frontend/Trunk.toml diff --git a/assets/Mockup.jpg b/frontend/assets/Mockup.jpg similarity index 100% rename from assets/Mockup.jpg rename to frontend/assets/Mockup.jpg diff --git a/assets/add.svg b/frontend/assets/add.svg similarity index 100% rename from assets/add.svg rename to frontend/assets/add.svg diff --git a/assets/chat_bubbles.jpg b/frontend/assets/chat_bubbles.jpg similarity index 100% rename from assets/chat_bubbles.jpg rename to frontend/assets/chat_bubbles.jpg diff --git a/assets/chat_bubbles.png b/frontend/assets/chat_bubbles.png similarity index 100% rename from assets/chat_bubbles.png rename to frontend/assets/chat_bubbles.png diff --git a/assets/digitaler-frieden_logo.jpg b/frontend/assets/digitaler-frieden_logo.jpg similarity index 100% rename from assets/digitaler-frieden_logo.jpg rename to frontend/assets/digitaler-frieden_logo.jpg diff --git a/assets/digitaler-frieden_logo.svg b/frontend/assets/digitaler-frieden_logo.svg similarity index 100% rename from assets/digitaler-frieden_logo.svg rename to frontend/assets/digitaler-frieden_logo.svg diff --git a/assets/favicon.ico b/frontend/assets/favicon.ico similarity index 100% rename from assets/favicon.ico rename to frontend/assets/favicon.ico diff --git a/assets/icon.png b/frontend/assets/icon.png similarity index 100% rename from assets/icon.png rename to frontend/assets/icon.png diff --git a/assets/icon.svg b/frontend/assets/icon.svg similarity index 100% rename from assets/icon.svg rename to frontend/assets/icon.svg diff --git a/assets/icon_document_upload.svg b/frontend/assets/icon_document_upload.svg similarity index 100% rename from assets/icon_document_upload.svg rename to frontend/assets/icon_document_upload.svg diff --git a/assets/icon_round.png b/frontend/assets/icon_round.png similarity index 100% rename from assets/icon_round.png rename to frontend/assets/icon_round.png diff --git a/assets/icons/chair_magnifier.png b/frontend/assets/icons/chair_magnifier.png similarity index 100% rename from assets/icons/chair_magnifier.png rename to frontend/assets/icons/chair_magnifier.png diff --git a/assets/icons/conversation.png b/frontend/assets/icons/conversation.png similarity index 100% rename from assets/icons/conversation.png rename to frontend/assets/icons/conversation.png diff --git a/assets/icons/financial_growth.png b/frontend/assets/icons/financial_growth.png similarity index 100% rename from assets/icons/financial_growth.png rename to frontend/assets/icons/financial_growth.png diff --git a/assets/icons/icon.jpg b/frontend/assets/icons/icon.jpg similarity index 100% rename from assets/icons/icon.jpg rename to frontend/assets/icons/icon.jpg diff --git a/assets/icons/map_search.png b/frontend/assets/icons/map_search.png similarity index 100% rename from assets/icons/map_search.png rename to frontend/assets/icons/map_search.png diff --git a/assets/icons/message_lookout.png b/frontend/assets/icons/message_lookout.png similarity index 100% rename from assets/icons/message_lookout.png rename to frontend/assets/icons/message_lookout.png diff --git a/assets/icons/office.png b/frontend/assets/icons/office.png similarity index 100% rename from assets/icons/office.png rename to frontend/assets/icons/office.png diff --git a/assets/icons/people_cheering.png b/frontend/assets/icons/people_cheering.png similarity index 100% rename from assets/icons/people_cheering.png rename to frontend/assets/icons/people_cheering.png diff --git a/assets/mail.svg b/frontend/assets/mail.svg similarity index 100% rename from assets/mail.svg rename to frontend/assets/mail.svg diff --git a/assets/paper_plane.svg b/frontend/assets/paper_plane.svg similarity index 100% rename from assets/paper_plane.svg rename to frontend/assets/paper_plane.svg diff --git a/assets/remove.svg b/frontend/assets/remove.svg similarity index 100% rename from assets/remove.svg rename to frontend/assets/remove.svg diff --git a/assets/styles.css b/frontend/assets/styles.css similarity index 100% rename from assets/styles.css rename to frontend/assets/styles.css diff --git a/assets/vector-EPS.eps b/frontend/assets/vector-EPS.eps similarity index 100% rename from assets/vector-EPS.eps rename to frontend/assets/vector-EPS.eps diff --git a/assets/vector-SVG.svg b/frontend/assets/vector-SVG.svg similarity index 100% rename from assets/vector-SVG.svg rename to frontend/assets/vector-SVG.svg diff --git a/dist/digitaler-frieden-66f4a2f1dfe699d158fb216baa50f09298585f4829c65922dcdfe4324ea2e6d37b258786aad38b71270f40b7bef9e4d0.js b/frontend/dist/digitaler-frieden-frontend-966184f58f0dec130de874bf4a4e9dbea4d2e01aeb5d4c580e786766d8bf5d5d1405401be9a2426f131ac8176ef49da1.js similarity index 99% rename from dist/digitaler-frieden-66f4a2f1dfe699d158fb216baa50f09298585f4829c65922dcdfe4324ea2e6d37b258786aad38b71270f40b7bef9e4d0.js rename to frontend/dist/digitaler-frieden-frontend-966184f58f0dec130de874bf4a4e9dbea4d2e01aeb5d4c580e786766d8bf5d5d1405401be9a2426f131ac8176ef49da1.js index 9544ab2..2e6c49e 100644 --- a/dist/digitaler-frieden-66f4a2f1dfe699d158fb216baa50f09298585f4829c65922dcdfe4324ea2e6d37b258786aad38b71270f40b7bef9e4d0.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(); diff --git a/dist/digitaler-frieden-66f4a2f1dfe699d158fb216baa50f09298585f4829c65922dcdfe4324ea2e6d37b258786aad38b71270f40b7bef9e4d0_bg.wasm b/frontend/dist/digitaler-frieden-frontend-966184f58f0dec130de874bf4a4e9dbea4d2e01aeb5d4c580e786766d8bf5d5d1405401be9a2426f131ac8176ef49da1_bg.wasm similarity index 73% rename from dist/digitaler-frieden-66f4a2f1dfe699d158fb216baa50f09298585f4829c65922dcdfe4324ea2e6d37b258786aad38b71270f40b7bef9e4d0_bg.wasm rename to frontend/dist/digitaler-frieden-frontend-966184f58f0dec130de874bf4a4e9dbea4d2e01aeb5d4c580e786766d8bf5d5d1405401be9a2426f131ac8176ef49da1_bg.wasm index 94a4858..cff2fb3 100644 Binary files a/dist/digitaler-frieden-66f4a2f1dfe699d158fb216baa50f09298585f4829c65922dcdfe4324ea2e6d37b258786aad38b71270f40b7bef9e4d0_bg.wasm and b/frontend/dist/digitaler-frieden-frontend-966184f58f0dec130de874bf4a4e9dbea4d2e01aeb5d4c580e786766d8bf5d5d1405401be9a2426f131ac8176ef49da1_bg.wasm differ diff --git a/dist/favicon-928ba63f33046eed.ico b/frontend/dist/favicon-928ba63f33046eed.ico similarity index 100% rename from dist/favicon-928ba63f33046eed.ico rename to frontend/dist/favicon-928ba63f33046eed.ico diff --git a/dist/index.html b/frontend/dist/index.html similarity index 84% rename from dist/index.html rename to frontend/dist/index.html index 243abbc..6665c24 100644 --- a/dist/index.html +++ b/frontend/dist/index.html @@ -7,15 +7,15 @@ - - + +