Rustfmt moment
This commit is contained in:
parent
ef2042d33c
commit
8b0d35987a
|
@ -17,13 +17,13 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use crate::templates;
|
use crate::templates;
|
||||||
|
use argon2::Argon2;
|
||||||
use argon2::PasswordHasher;
|
use argon2::PasswordHasher;
|
||||||
use sqlx::postgres::{PgConnectOptions, PgConnectionInfo, PgPoolOptions};
|
use sqlx::postgres::{PgConnectOptions, PgConnectionInfo, PgPoolOptions};
|
||||||
use sqlx::Executor;
|
use sqlx::Executor;
|
||||||
use sqlx::{ConnectOptions, PgPool};
|
use sqlx::{ConnectOptions, PgPool};
|
||||||
use tracing::info;
|
use tracing::info;
|
||||||
use tracing::log::LevelFilter;
|
use tracing::log::LevelFilter;
|
||||||
use argon2::Argon2;
|
|
||||||
|
|
||||||
pub struct Database(PgPool, String);
|
pub struct Database(PgPool, String);
|
||||||
|
|
||||||
|
|
|
@ -48,4 +48,3 @@ pub struct Register {
|
||||||
pub username: String,
|
pub username: String,
|
||||||
pub password: String,
|
pub password: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -48,4 +48,3 @@ pub struct Login();
|
||||||
#[template(path = "register.html")]
|
#[template(path = "register.html")]
|
||||||
|
|
||||||
pub struct Register();
|
pub struct Register();
|
||||||
|
|
||||||
|
|
42
src/web.rs
42
src/web.rs
|
@ -16,7 +16,7 @@
|
||||||
* this program. If not, see <http://www.gnu.org/licenses/>.
|
* this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use crate::{task, templates, database::Database};
|
use crate::{database::Database, task, templates};
|
||||||
use actix_web::{http::StatusCode, web, HttpResponse, HttpResponseBuilder, HttpServer, Responder};
|
use actix_web::{http::StatusCode, web, HttpResponse, HttpResponseBuilder, HttpServer, Responder};
|
||||||
use askama::Template;
|
use askama::Template;
|
||||||
use std::net::SocketAddr;
|
use std::net::SocketAddr;
|
||||||
|
@ -34,12 +34,9 @@ impl App {
|
||||||
web::resource("/task")
|
web::resource("/task")
|
||||||
.app_data(web::Data::new(db.clone()))
|
.app_data(web::Data::new(db.clone()))
|
||||||
.route(web::get().to(task)),
|
.route(web::get().to(task)),
|
||||||
web::resource("/create")
|
web::resource("/create").route(web::get().to(create)),
|
||||||
.route(web::get().to(create)),
|
web::resource("/login").route(web::get().to(login)),
|
||||||
web::resource("/login")
|
web::resource("/register").route(web::get().to(register)),
|
||||||
.route(web::get().to(login)),
|
|
||||||
web::resource("/register")
|
|
||||||
.route(web::get().to(register)),
|
|
||||||
web::resource("/api/task/create")
|
web::resource("/api/task/create")
|
||||||
.app_data(web::Data::new(db.clone()))
|
.app_data(web::Data::new(db.clone()))
|
||||||
.route(web::post().to(create_task)),
|
.route(web::post().to(create_task)),
|
||||||
|
@ -87,31 +84,46 @@ async fn register() -> impl Responder {
|
||||||
HttpResponseBuilder::new(StatusCode::OK).body(html)
|
HttpResponseBuilder::new(StatusCode::OK).body(html)
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn create_task(req: web::Form<task::CreateTask>, db: web::Data<Arc<Database>>) -> impl Responder {
|
async fn create_task(
|
||||||
|
req: web::Form<task::CreateTask>,
|
||||||
|
db: web::Data<Arc<Database>>,
|
||||||
|
) -> impl Responder {
|
||||||
tracing::debug!("Got POST request on /api/task/create: {:#?}", req);
|
tracing::debug!("Got POST request on /api/task/create: {:#?}", req);
|
||||||
HttpResponse::SeeOther().insert_header(("Location", "/task")).finish()
|
HttpResponse::SeeOther()
|
||||||
|
.insert_header(("Location", "/task"))
|
||||||
|
.finish()
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn move_task(req: web::Form<task::MoveTask>, db: web::Data<Arc<Database>>) -> impl Responder {
|
async fn move_task(req: web::Form<task::MoveTask>, db: web::Data<Arc<Database>>) -> impl Responder {
|
||||||
tracing::debug!("Got POST request on /api/task/move: {:#?}", req);
|
tracing::debug!("Got POST request on /api/task/move: {:#?}", req);
|
||||||
HttpResponse::SeeOther().insert_header(("Location", "/task")).finish()
|
HttpResponse::SeeOther()
|
||||||
|
.insert_header(("Location", "/task"))
|
||||||
|
.finish()
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn sort_task(req: web::Form<task::SortTask>, db: web::Data<Arc<Database>>) -> impl Responder {
|
async fn sort_task(req: web::Form<task::SortTask>, db: web::Data<Arc<Database>>) -> impl Responder {
|
||||||
tracing::debug!("Got POST request on /api/task/sort: {:#?}", req);
|
tracing::debug!("Got POST request on /api/task/sort: {:#?}", req);
|
||||||
HttpResponse::SeeOther().insert_header(("Location", "/task")).finish()
|
HttpResponse::SeeOther()
|
||||||
|
.insert_header(("Location", "/task"))
|
||||||
|
.finish()
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn login_user(req: web::Form<task::Login>, db: web::Data<Arc<Database>>) -> impl Responder {
|
async fn login_user(req: web::Form<task::Login>, db: web::Data<Arc<Database>>) -> impl Responder {
|
||||||
tracing::debug!("Got POST request on /api/login");
|
tracing::debug!("Got POST request on /api/login");
|
||||||
db.login(&req.username, &req.password).await;
|
db.login(&req.username, &req.password).await;
|
||||||
HttpResponse::SeeOther().insert_header(("Location", "/task")).finish()
|
HttpResponse::SeeOther()
|
||||||
|
.insert_header(("Location", "/task"))
|
||||||
|
.finish()
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn register_user(req: web::Form<task::Register>, db: web::Data<Arc<Database>>) -> impl Responder {
|
async fn register_user(
|
||||||
|
req: web::Form<task::Register>,
|
||||||
|
db: web::Data<Arc<Database>>,
|
||||||
|
) -> impl Responder {
|
||||||
tracing::debug!("Got POST request on /api/register");
|
tracing::debug!("Got POST request on /api/register");
|
||||||
let db = db.clone();
|
let db = db.clone();
|
||||||
db.register(&req.username, &req.password).await;
|
db.register(&req.username, &req.password).await;
|
||||||
HttpResponse::SeeOther().insert_header(("Location", "/task")).finish()
|
HttpResponse::SeeOther()
|
||||||
|
.insert_header(("Location", "/task"))
|
||||||
|
.finish()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue