init server

LIU9293 · Jul 3, 2023 · 199ddf8 · 199ddf8
1 parent ef1e6d1
commit 199ddf8
Show file tree

Hide file tree

Showing 23 changed files with 286 additions and 77 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -9,9 +9,7 @@ Cargo.lock
 # These are backup files generated by rustfmt
 **/*.rs.bk
 
-
 # Added by cargo
-
 /target
 /dist
 .vercel

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -8,6 +8,8 @@
     "./Cargo.toml",
     "./Cargo.toml",
     "./Cargo.toml",
-    "./Cargo.toml"
-  ]
+    "./Cargo.toml",
+    "./packages/shared/Cargo.toml"
+  ],
+  "rust-analyzer.showUnlinkedFileNotification": false
 }
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,30 +1,37 @@
-[package]
-name = "rust-2048"
-version = "0.1.0"
-description = "It's a 2048 game written in Rust."
-authors = ["liu9293 <[email protected]>"]
-edition = "2021"
+# [package]
+# name = "rust-2048"
+# version = "0.1.0"
+# description = "It's a 2048 game written in Rust."
+# authors = ["liu9293 <[email protected]>"]
+# edition = "2021"
 
-[dependencies]
-dioxus-router = "0.3.0"
-rand = "0.8.5"
-getrandom = { version = "0.2", features = ["js"] }
+# [dependencies]
+# dioxus-router = "0.3.0"
+# rand = "0.8.5"
+# getrandom = { version = "0.2", features = ["js"] }
 
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-dioxus = "0.3.0"
-dioxus-desktop = "0.3.0"
+# [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+# dioxus = "0.3.0"
+# dioxus-desktop = "0.3.0"
 
-[target.'cfg(target_arch = "wasm32")'.dependencies]
-dioxus = "0.3.2"
-dioxus-web = "0.3.2"
+# [target.'cfg(target_arch = "wasm32")'.dependencies]
+# dioxus = "0.3.2"
+# dioxus-web = "0.3.2"
 
-[package.metadata.bundle]
-name = "Rust 2048"
-identifier = "com.rust.kaixiaozao"
-version = "0.0.1"
-copyright = "Copyright (c) KaiXiaoZao 2023. All rights reserved."
-category = "Game"
-short_description = "2048 game"
-long_description = """
-It's a 2048 game written in Rust.
-"""
+# [package.metadata.bundle]
+# name = "Rust 2048"
+# identifier = "com.rust.kaixiaozao"
+# version = "0.0.1"
+# copyright = "Copyright (c) KaiXiaoZao 2023. All rights reserved."
+# category = "Game"
+# short_description = "2048 game"
+# long_description = """
+# It's a 2048 game written in Rust.
+# """
+
+[workspace]
+members = [
+    "packages/client",
+    "packages/shared",
+    "packages/server"
+]
diff --git a/Dioxus.toml b/Dioxus.toml
@@ -1,8 +1,9 @@
 [application]
 name = "rust-2048"
 default_platform = "web"
-out_dir = "dist"
-asset_dir = "public"
+out_dir = "../../dist"
+asset_dir = "../../public"
+sub_package = "packages/client"
 
 [web.app]
 title = "rust-2048"

diff --git a/README.md b/README.md
@@ -4,6 +4,10 @@ Live Demo -> https://rust-2048.vercel.app/
 
 ### Test and run
 ```
+1. Run server
+cargo run -p server
+
+2. Run client
 // web
 dioxus serve --platform web
 
@@ -33,6 +37,8 @@ dioxus serve --platform desktop
 - [ ] CI/CD
   * Web -> Vercel, done
   * Desktop?
+- [x] Server, record game progress
+- [ ] Server, record progress for multiple users
 
 ### Server 
 

diff --git a/index.html b/index.html
@@ -9,20 +9,12 @@
     <script src="https://cdn.tailwindcss.com"></script>
     {style_include}
     <style>
-      html, body {
-        background-color: #495057;
-        color: white;
-      }
-
-      #main {
-        min-height: 100vh;
-        width: 100%;
-      }
+      html,body { background-color: #495057; color: white; }
+      #main { min-height: 100vh; width: 100%; }
     </style>
   </head>
   <body>
     <div id="main"></div>
-    <!-- Note the usage of `type=module` here as this is an ES6 module -->
     <script type="module">
       import init from "/{base_path}/assets/dioxus/{app_name}.js";
       init("/{base_path}/assets/dioxus/{app_name}_bg.wasm").then((wasm) => {
@@ -44,9 +36,7 @@
           counter = 0
           new_e = new e.constructor(e.type, e);
           gamearea.dispatchEvent(new_e);
-          setTimeout(function() {
-            counter = 1
-          }, 100);
+          setTimeout(function() { counter = 1 }, 20);
         }
       });
     </script>

diff --git a/packages/client/Cargo.toml b/packages/client/Cargo.toml
@@ -0,0 +1,38 @@
+[package]
+name = "client"
+version = "0.1.0"
+description = "It's a 2048 game written in Rust."
+authors = ["liu9293 <[email protected]>"]
+edition = "2021"
+
+[dependencies]
+dioxus-router = "0.3.0"
+rand = "0.8.5"
+getrandom = { version = "0.2", features = ["js"] }
+futures = "0.3"
+reqwest = { version = "0.11", features = ["json"] }
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+log = "0.4"
+shared = { path = "../shared" }
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+dioxus = "0.3.0"
+dioxus-desktop = "0.3.0"
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+dioxus = "0.3.2"
+dioxus-web = "0.3.2"
+wasm-logger = "0.2.0"
+console_error_panic_hook = "0.1.7"
+
+[package.metadata.bundle]
+name = "Rust 2048"
+identifier = "com.rust.kaixiaozao"
+version = "0.0.1"
+copyright = "Copyright (c) KaiXiaoZao 2023. All rights reserved."
+category = "Game"
+short_description = "2048 game"
+long_description = """
+It's a 2048 game written in Rust.
+"""
diff --git a/src/components/cell.rs → packages/client/src/components/cell.rs b/src/components/cell.rs → packages/client/src/components/cell.rs
diff --git a/src/components/mod.rs → packages/client/src/components/mod.rs b/src/components/mod.rs → packages/client/src/components/mod.rs
diff --git a/src/components/row.rs → packages/client/src/components/row.rs b/src/components/row.rs → packages/client/src/components/row.rs
diff --git a/src/main.rs → packages/client/src/main.rs b/src/main.rs → packages/client/src/main.rs
@@ -1,7 +1,7 @@
 #![allow(non_snake_case)]
 mod pages;
 mod components;
-mod utils;
+// mod utils;
 use dioxus::prelude::*;
 use dioxus_router::{Route, Router};
 use crate::pages::game::Game;
@@ -24,15 +24,8 @@ fn main() {
                     <script src="https://cdn.tailwindcss.com"></script>
                     <style>
                         html,
-                        body {
-                            background-color: #495057;
-                            color: white;
-                        }
-
-                        #main {
-                            min-height: 100vh;
-                            width: 100%;
-                        }
+                        body { background-color: #495057; color: white; }
+                        #main { min-height: 100vh; width: 100%; }
                     </style>
                 </head>
                 <body>
@@ -45,12 +38,10 @@ fn main() {
                             return
                         }
                         if (counter === 1) {
-                        counter = 0
-                        new_e = new e.constructor(e.type, e);
-                        gamearea.dispatchEvent(new_e);
-                        setTimeout(function() {
-                            counter = 1
-                        }, 100);
+                            counter = 0
+                            new_e = new e.constructor(e.type, e);
+                            gamearea.dispatchEvent(new_e);
+                            setTimeout(function() { counter = 1 }, 20);
                         }
                     });
                     </script>
@@ -63,7 +54,6 @@ fn main() {
 
     #[cfg(target_arch = "wasm32")]
     // wasm_logger::init(wasm_logger::Config::default());
-    // console_error_panic_hook::set_once();
     dioxus_web::launch(app);
 }
 

diff --git a/src/pages/game.rs → packages/client/src/pages/game.rs b/src/pages/game.rs → packages/client/src/pages/game.rs
@@ -1,14 +1,43 @@
 use dioxus::prelude::*;
 use dioxus::html::input_data::keyboard_types::Key;
 use dioxus::html::KeyboardEvent;
+use shared::types::{Board, GameStatus, ProgressReqeust};
+use reqwest;
+use shared::logic::{get_initial_board_data, add_random, move_up, move_down, move_left, move_right, check_and_do_next};
+use log;
 use crate::components::row::Row;
-use crate::utils::types::{Board, GameStatus};
-use crate::utils::logic::{get_initial_board_data, add_random, move_up, move_down, move_left, move_right, check_and_do_next};
 
 pub fn Game(cx: Scope) -> Element {
     let game_status = use_state(cx, || GameStatus::Playing);
     let board_data: &UseState<Board> = use_state(cx, || get_initial_board_data());
-
+    let is_first_load = use_state(cx, || true);
+
+    use_effect(cx, (is_first_load, board_data), |(is_first_load, board_data)| async move {
+        if !is_first_load.get() {
+            return;
+        }
+
+        let client = reqwest::Client::new();
+        let res = client.get("http://localhost:3000/progress").send().await;
+        match res {
+            Ok(response) => {
+                let payload = response.json::<ProgressReqeust>().await;
+                match payload {
+                    Ok(data) => {
+                        is_first_load.set(false);
+                        board_data.set(data.board);
+                    },
+                    Err(err) => {
+                        log::error!("Failed to parse JSON: {}", err);
+                    }
+                }
+            },
+            Err(err) => {
+                log::error!("Failed to send request: {}", err);
+            }
+        }
+    });
+
     let handle_key_down_event = move |evt: KeyboardEvent| -> () {
         if *game_status.get() != GameStatus::Playing {
             return;
@@ -36,7 +65,26 @@ pub fn Game(cx: Scope) -> Element {
                 game_status.set(GameStatus::Fail);
             },
             GameStatus::Playing => { board_data.set(new_data); },
-        }
+        }    
+
+        cx.spawn({
+            async move {
+                let client = reqwest::Client::new();
+                let res = client.post("http://localhost:3000/progress")
+                    .json(&ProgressReqeust {
+                        board: new_data
+                    })
+                    .send()
+                    .await;
+
+                match res {
+                    Ok(_) => {},
+                    Err(err) => {
+                        log::error!("Failed to record progress: {}", err);
+                    }
+                }
+            }
+        });
     };
 
     let total_score = board_data.get().iter().flatten().sum::<i32>();

diff --git a/src/pages/homepage.rs → packages/client/src/pages/homepage.rs b/src/pages/homepage.rs → packages/client/src/pages/homepage.rs
diff --git a/src/pages/mod.rs → packages/client/src/pages/mod.rs b/src/pages/mod.rs → packages/client/src/pages/mod.rs
diff --git a/packages/server/Cargo.toml b/packages/server/Cargo.toml
@@ -0,0 +1,13 @@
+[package]
+name = "server"
+version = "0.1.0"
+edition = "2021"
+publish = false
+
+[dependencies]
+axum = { version = "0.6" }
+tokio = { version = "1.0", features = ["full"] }
+tower-http = { version = "0.3.0", features = ["cors"] }
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+shared = { path = "../shared" }
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,9 +9,7 @@ Cargo.lock @@
     # These are backup files generated by rustfmt
     **/*.rs.bk
     # Added by cargo
     /target
     /dist
     .vercel
@@ Expand Down @@