8 files changed
+17
-12
src/account/login/mod.rs
renamed
src/account/login/process.rs
renamed
+1
-7
@@ -7,7 +7,7 @@ use anyhow::{anyhow, Result};
7
use reqwest::Client;
8
use serde::{Deserialize, Serialize};
9
10
-use crate::constants::BASE_URL;
10
+use crate::{account::model::User, constants::BASE_URL};
11
12
pub struct LoginArgs {
13
pub username: String,
@@ -19,12 +19,6 @@ struct LoginParams {
19
user: User,
20
}
21
22
-#[derive(Debug, Serialize)]
23
-pub struct User {
24
- pub(crate) email: String,
25
- pub(crate) password: String,
26
-}
27
-
22
#[derive(Debug, Serialize, Deserialize)]
23
struct LoginResult {
24
status: Status,
src/account/mod.rs
new
+3
@@ -0,0 +1,3 @@
1
+pub mod login;
2
+pub mod model;
3
+pub mod signup;
src/account/model/mod.rs
new
+7
@@ -0,0 +1,7 @@
1
+use serde::Serialize;
2
+
3
+#[derive(Debug, Serialize)]
4
+pub struct User {
5
+ pub(crate) email: String,
6
+ pub(crate) password: String,
7
+}
src/account/signup/mod.rs
renamed
src/account/signup/process.rs
renamed
+1
-1
@@ -2,7 +2,7 @@ use anyhow::{anyhow, Result};
2
use reqwest::Client;
3
use serde::Serialize;
4
5
-use crate::{constants::BASE_URL, login::User};
5
+use crate::{account::model::User, constants::BASE_URL};
6
pub struct SignupArgs {
7
pub username: String,
8
pub password: String,
src/lib.rs
+1
-2
@@ -1,4 +1,3 @@
1
+pub mod account;
2
pub mod cli;
3
pub mod constants;
3
-pub mod login;
4
-pub mod signup;
src/main.rs
+4
-2
@@ -6,10 +6,12 @@ use console::style;
6
use dialoguer::{theme::ColorfulTheme, Input, Password};
7
use regex::Regex;
8
use smbpndk_cli::{
9
+ account::{
10
+ login::{process_login, LoginArgs},
11
+ signup::{process_signup, SignupArgs},
12
+ },
13
cli::{Cli, Commands},
14
constants::ERROR_EMOJI,
11
- login::{process_login, LoginArgs},
12
- signup::{process_signup, SignupArgs},
15
};
16
use spinners::Spinner;
17