").unwrap();
+
+ index.insert_str(body_pos + 15, &dioxus_ssr::pre_render(&vdom));
+
+ Html(index)
}
diff --git a/src/api/user.rs b/src/api/user.rs
index 9ff2ee5..2fc0aab 100644
--- a/src/api/user.rs
+++ b/src/api/user.rs
@@ -1,14 +1,12 @@
use axum::{
extract::{Path, State},
http::StatusCode,
+ response::IntoResponse,
Json,
};
use serde::Deserialize;
-use crate::db::{
- models::user::{NewUser, User},
- repos,
-};
+use crate::db::{models::user::NewUser, repos};
use super::{error::Error, ApiState};
@@ -23,7 +21,7 @@ pub struct ApiUser {
pub async fn create_user(
State(s): State
,
Json(payload): Json,
-) -> Result<(StatusCode, Json), Error> {
+) -> Result {
let user = repos::user::create_user(
&s.pool,
NewUser {
@@ -38,13 +36,13 @@ pub async fn create_user(
Ok((StatusCode::CREATED, Json(user)))
}
-pub async fn list_users(State(s): State) -> Result>, Error> {
+pub async fn list_users(State(s): State) -> Result {
Ok(Json(repos::user::list_users(&s.pool).await?))
}
pub async fn get_user(
State(s): State,
Path(user_id): Path,
-) -> Result, Error> {
+) -> Result {
Ok(Json(repos::user::fetch_user(&s.pool, user_id).await?))
}
diff --git a/src/db/repos/user.rs b/src/db/repos/user.rs
index c6272ff..9371506 100644
--- a/src/db/repos/user.rs
+++ b/src/db/repos/user.rs
@@ -33,3 +33,21 @@ pub async fn fetch_user(pool: &DbPool, user_id: i32) -> Result {
.first(&mut conn)
.await?)
}
+
+pub async fn fetch_login_user(
+ pool: &DbPool,
+ username: &str,
+ password_salt: &str,
+) -> Result {
+ let mut conn = pool.get().await?;
+
+ Ok(users::table
+ .filter(
+ users::email
+ .eq(username)
+ .and(users::password.eq(password_salt)),
+ )
+ .select(User::as_select())
+ .first(&mut conn)
+ .await?)
+}
diff --git a/src/main.rs b/src/main.rs
index 75e5f1e..53d13b5 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -2,10 +2,15 @@ mod api;
mod db;
mod error;
+use dioxus::prelude::hot_reload_init;
pub use error::{Error, ErrorKind};
#[tokio::main]
async fn main() -> Result<(), Error> {
+ hot_reload_init!();
+ pretty_env_logger::init();
+ dotenv::dotenv().ok();
+
let durl = std::env::var("DATABASE_URL")
.unwrap_or_else(|_| "postgres://postgres@127.0.0.1:5432/kttd".to_string());
diff --git a/ui/Cargo.toml b/ui/Cargo.toml
deleted file mode 100644
index 08d956a..0000000
--- a/ui/Cargo.toml
+++ /dev/null
@@ -1,10 +0,0 @@
-[package]
-name = "ui"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-dioxus = "0.3.2"
-dioxus-web = "0.3.1"
diff --git a/ui/dist/assets/dioxus/dioxus_bg.wasm b/ui/dist/assets/dioxus/dioxus_bg.wasm
deleted file mode 100644
index 6769b75..0000000
Binary files a/ui/dist/assets/dioxus/dioxus_bg.wasm and /dev/null differ
diff --git a/ui/dist/index.html b/ui/dist/index.html
deleted file mode 100644
index cb3c4cf..0000000
--- a/ui/dist/index.html
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
- dioxus | ⛺
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/ui/src/main.rs b/ui/src/main.rs
deleted file mode 100644
index 9d43dd5..0000000
--- a/ui/src/main.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-#![allow(non_snake_case)]
-// import the prelude to get access to the `rsx!` macro and the `Scope` and `Element` types
-use dioxus::prelude::*;
-
-fn main() {
- // launch the web app
- dioxus_web::launch(App);
-}
-
-// create a component that renders a div with the text "Hello, world!"
-fn App(cx: Scope) -> Element {
- let mut count = use_state(cx, || 0);
-
- cx.render(rsx! {
- h1 { "High-Five counter: {count}" }
- button { onclick: move |_| count += 1, "Up high!" }
- button { onclick: move |_| count -= 1, "Down low!" }
- })
-}