C4TG1RL5_UN1T3D/tmtd
4
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Rustfmt moment

Browse source
This commit is contained in:
famfo 2022-05-11 11:26:44 +02:00
parent ef2042d33c
commit 8b0d35987a
4 changed files with 32 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/database.rs
View file

@ -17,13 +17,13 @@
*/
use crate::templates;
use argon2::Argon2;
use argon2::PasswordHasher;
use sqlx::postgres::{PgConnectOptions, PgConnectionInfo, PgPoolOptions};
use sqlx::Executor;
use sqlx::{ConnectOptions, PgPool};
use tracing::info;
use tracing::log::LevelFilter;
use argon2::Argon2;
pub struct Database(PgPool, String);
@ -86,7 +86,7 @@ impl Database {
return;
}
tracing::debug!("{}", hash.unwrap());
// TODO: insert into DB
// TODO: insert into DB
}
pub async fn login(&self, username: &str, password: &str) {

1
src/task.rs
View file

@ -48,4 +48,3 @@ pub struct Register {
pub username: String,
pub password: String,
}

1
src/templates.rs
View file

@ -48,4 +48,3 @@ pub struct Login();
#[template(path = "register.html")]
pub struct Register();

48
src/web.rs
View file

@ -16,7 +16,7 @@
* 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 askama::Template;
use std::net::SocketAddr;
@ -34,12 +34,9 @@ impl App {
web::resource("/task")
.app_data(web::Data::new(db.clone()))
.route(web::get().to(task)),
web::resource("/create")
.route(web::get().to(create)),
web::resource("/login")
.route(web::get().to(login)),
web::resource("/register")
.route(web::get().to(register)),
web::resource("/create").route(web::get().to(create)),
web::resource("/login").route(web::get().to(login)),
web::resource("/register").route(web::get().to(register)),
web::resource("/api/task/create")
.app_data(web::Data::new(db.clone()))
.route(web::post().to(create_task)),
@ -70,48 +67,63 @@ async fn task(db: web::Data<Arc<Database>>) -> impl Responder {
}
async fn create() -> impl Responder {
let create = templates::CreateTask{};
let create = templates::CreateTask {};
let html = create.render().unwrap();
HttpResponseBuilder::new(StatusCode::OK).body(html)
}
async fn login() -> impl Responder {
let login = templates::Login{};
let login = templates::Login {};
let html = login.render().unwrap();
HttpResponseBuilder::new(StatusCode::OK).body(html)
}
async fn register() -> impl Responder {
let register = templates::Register{};
let register = templates::Register {};
let html = register.render().unwrap();
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);
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 {
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 {
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 {
tracing::debug!("Got POST request on /api/login");
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");
let db = db.clone();
db.register(&req.username, &req.password).await;
HttpResponse::SeeOther().insert_header(("Location", "/task")).finish()
HttpResponse::SeeOther()
.insert_header(("Location", "/task"))
.finish()
}