Rename project to progress-pile
This commit is contained in:
parent
4b3484e7d3
commit
93879ba97d
54 changed files with 123 additions and 118 deletions
158
Cargo.lock
generated
158
Cargo.lock
generated
|
@ -913,81 +913,6 @@ version = "0.15.7"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
|
checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "dpts-cli"
|
|
||||||
version = "0.1.0"
|
|
||||||
dependencies = [
|
|
||||||
"chrono",
|
|
||||||
"chrono-tz",
|
|
||||||
"clap",
|
|
||||||
"dpts-client",
|
|
||||||
"thiserror 2.0.12",
|
|
||||||
"tokio",
|
|
||||||
"toml",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "dpts-client"
|
|
||||||
version = "0.1.0"
|
|
||||||
dependencies = [
|
|
||||||
"chrono-tz",
|
|
||||||
"clap",
|
|
||||||
"dirs",
|
|
||||||
"dpts-core",
|
|
||||||
"serde",
|
|
||||||
"thiserror 2.0.12",
|
|
||||||
"tokio",
|
|
||||||
"toml",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "dpts-core"
|
|
||||||
version = "0.1.0"
|
|
||||||
dependencies = [
|
|
||||||
"async-graphql",
|
|
||||||
"axum",
|
|
||||||
"chrono",
|
|
||||||
"chrono-tz",
|
|
||||||
"clap",
|
|
||||||
"csv",
|
|
||||||
"cynic",
|
|
||||||
"dotenv",
|
|
||||||
"dpts-migration",
|
|
||||||
"iana-time-zone",
|
|
||||||
"log",
|
|
||||||
"sea-orm",
|
|
||||||
"serde",
|
|
||||||
"thiserror 2.0.12",
|
|
||||||
"tokio",
|
|
||||||
"toml",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "dpts-migration"
|
|
||||||
version = "0.1.0"
|
|
||||||
dependencies = [
|
|
||||||
"async-std",
|
|
||||||
"sea-orm-migration",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "dpts-server"
|
|
||||||
version = "0.1.0"
|
|
||||||
dependencies = [
|
|
||||||
"argon2",
|
|
||||||
"async-graphql",
|
|
||||||
"async-graphql-axum",
|
|
||||||
"axum",
|
|
||||||
"chrono",
|
|
||||||
"clap",
|
|
||||||
"dpts-core",
|
|
||||||
"rand 0.9.1",
|
|
||||||
"serde",
|
|
||||||
"thiserror 2.0.12",
|
|
||||||
"tokio",
|
|
||||||
"toml",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "either"
|
name = "either"
|
||||||
version = "1.15.0"
|
version = "1.15.0"
|
||||||
|
@ -2315,6 +2240,89 @@ dependencies = [
|
||||||
"yansi",
|
"yansi",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "progress-pile-cli"
|
||||||
|
version = "0.1.0"
|
||||||
|
dependencies = [
|
||||||
|
"chrono",
|
||||||
|
"chrono-tz",
|
||||||
|
"clap",
|
||||||
|
"progress-pile-client",
|
||||||
|
"thiserror 2.0.12",
|
||||||
|
"tokio",
|
||||||
|
"toml",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "progress-pile-client"
|
||||||
|
version = "0.1.0"
|
||||||
|
dependencies = [
|
||||||
|
"chrono-tz",
|
||||||
|
"clap",
|
||||||
|
"dirs",
|
||||||
|
"progress-pile-core",
|
||||||
|
"serde",
|
||||||
|
"thiserror 2.0.12",
|
||||||
|
"tokio",
|
||||||
|
"toml",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "progress-pile-client-migration"
|
||||||
|
version = "0.1.0"
|
||||||
|
dependencies = [
|
||||||
|
"async-std",
|
||||||
|
"sea-orm-migration",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "progress-pile-core"
|
||||||
|
version = "0.1.0"
|
||||||
|
dependencies = [
|
||||||
|
"async-graphql",
|
||||||
|
"axum",
|
||||||
|
"chrono",
|
||||||
|
"chrono-tz",
|
||||||
|
"clap",
|
||||||
|
"csv",
|
||||||
|
"cynic",
|
||||||
|
"dotenv",
|
||||||
|
"iana-time-zone",
|
||||||
|
"log",
|
||||||
|
"progress-pile-server-migration",
|
||||||
|
"sea-orm",
|
||||||
|
"serde",
|
||||||
|
"thiserror 2.0.12",
|
||||||
|
"tokio",
|
||||||
|
"toml",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "progress-pile-server"
|
||||||
|
version = "0.1.0"
|
||||||
|
dependencies = [
|
||||||
|
"argon2",
|
||||||
|
"async-graphql",
|
||||||
|
"async-graphql-axum",
|
||||||
|
"axum",
|
||||||
|
"chrono",
|
||||||
|
"clap",
|
||||||
|
"progress-pile-core",
|
||||||
|
"rand 0.9.1",
|
||||||
|
"serde",
|
||||||
|
"thiserror 2.0.12",
|
||||||
|
"tokio",
|
||||||
|
"toml",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "progress-pile-server-migration"
|
||||||
|
version = "0.1.0"
|
||||||
|
dependencies = [
|
||||||
|
"async-std",
|
||||||
|
"sea-orm-migration",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "quote"
|
name = "quote"
|
||||||
version = "1.0.40"
|
version = "1.0.40"
|
||||||
|
|
15
Cargo.toml
15
Cargo.toml
|
@ -1,18 +1,19 @@
|
||||||
[workspace]
|
[workspace]
|
||||||
members = ["dpts-*"]
|
members = ["progress-pile-*"]
|
||||||
|
|
||||||
[workspace.dependencies]
|
[workspace.dependencies]
|
||||||
async-graphql = { version = "7.0", features = ["chrono"] }
|
async-graphql = { version = "7.0", features = ["chrono"] }
|
||||||
dpts-cli.path = "dpts-cli"
|
|
||||||
dpts-client.path = "dpts-client"
|
|
||||||
dpts-core = { path = "dpts-core" }
|
|
||||||
dpts-migration = {path = "dpts-migration"}
|
|
||||||
dpts-server = { path = "dpts-server" }
|
|
||||||
chrono = {version = "0.4", features = ["serde"]}
|
chrono = {version = "0.4", features = ["serde"]}
|
||||||
chrono-tz = {version = "0.10.3", features = ["serde"]}
|
chrono-tz = {version = "0.10.3", features = ["serde"]}
|
||||||
clap = {version = "4.5", features = ["derive"]}
|
clap = {version = "4.5", features = ["derive"]}
|
||||||
dirs = "6.0.0"
|
dirs = "6.0.0"
|
||||||
dotenv = "0.15.0"
|
dotenv = "0.15.0"
|
||||||
|
progress-pile-cli.path = "progress-pile-cli"
|
||||||
|
progress-pile-client.path = "progress-pile-client"
|
||||||
|
progress-pile-client-migration.path = "progress-pile-client-migration"
|
||||||
|
progress-pile-core = { path = "progress-pile-core" }
|
||||||
|
progress-pile-server.path = "progress-pile-server"
|
||||||
|
progress-pile-server-migration.path = "progress-pile-server-migration"
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
serde = { version = "1.0", features = ["derive"] }
|
||||||
thiserror = "2.0.12"
|
thiserror = "2.0.12"
|
||||||
tokio = "1.44.2"
|
tokio = "1.44.2"
|
||||||
|
@ -33,5 +34,5 @@ default-features = false
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
repository = "https://github.com/fluo10/dpts"
|
repository = "https://github.com/fluo10/progres-pile"
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
# DPTS
|
# Progress Pile
|
||||||
|
|
||||||
Digital tools for Progress Token Stack
|
Digital tools for Progress Pile, my personal lifehack.
|
|
@ -1,7 +0,0 @@
|
||||||
pub mod auth;
|
|
||||||
pub mod config;
|
|
||||||
|
|
||||||
pub use dpts_core::error;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
[package]
|
[package]
|
||||||
name = "dpts-cli"
|
name = "progress-pile-cli"
|
||||||
version.workspace = true
|
version.workspace = true
|
||||||
license.workspace = true
|
license.workspace = true
|
||||||
edition.workspace = true
|
edition.workspace = true
|
||||||
repository.workspace = true
|
repository.workspace = true
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
dpts-client = {workspace = true}
|
progress-pile-client = {workspace = true}
|
||||||
chrono = {workspace = true}
|
chrono = {workspace = true}
|
||||||
chrono-tz.workspace = true
|
chrono-tz.workspace = true
|
||||||
clap = {workspace = true, features = ["derive"]}
|
clap = {workspace = true, features = ["derive"]}
|
|
@ -1,8 +1,8 @@
|
||||||
use clap::{Args, Subcommand};
|
use clap::{Args, Subcommand};
|
||||||
use chrono_tz::Tz;
|
use chrono_tz::Tz;
|
||||||
use crate::error::Error;
|
use crate::error::Error;
|
||||||
use dpts_client::auth::try_login;
|
use progress_pile_client::auth::try_login;
|
||||||
use dpts_client::config::{
|
use progress_pile_client::config::{
|
||||||
ClientConfig, ClientRemoteStorageConfig, ClientStorageConfig, Config, GlobalConfig, PartialGlobalConfig
|
ClientConfig, ClientRemoteStorageConfig, ClientStorageConfig, Config, GlobalConfig, PartialGlobalConfig
|
||||||
};
|
};
|
||||||
|
|
|
@ -3,7 +3,7 @@ mod init;
|
||||||
mod record;
|
mod record;
|
||||||
mod user;
|
mod user;
|
||||||
|
|
||||||
pub use dpts_client::error;
|
pub use progress_pile_client::error;
|
||||||
|
|
||||||
|
|
||||||
//use label::LabelArgs;
|
//use label::LabelArgs;
|
|
@ -1,6 +1,6 @@
|
||||||
use clap::{Args, Subcommand};
|
use clap::{Args, Subcommand};
|
||||||
use crate::error::Error;
|
use crate::error::Error;
|
||||||
use dpts_client::config::Config;
|
use progress_pile_client::config::Config;
|
||||||
|
|
||||||
|
|
||||||
#[derive(Args, Clone, Debug)]
|
#[derive(Args, Clone, Debug)]
|
|
@ -1,5 +1,5 @@
|
||||||
[package]
|
[package]
|
||||||
name = "dpts-client"
|
name = "progress-pile-client"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
|
|
||||||
|
@ -11,7 +11,7 @@ clap = ["dep:clap"]
|
||||||
chrono-tz.workspace = true
|
chrono-tz.workspace = true
|
||||||
clap = { workspace = true, optional = true }
|
clap = { workspace = true, optional = true }
|
||||||
dirs.workspace = true
|
dirs.workspace = true
|
||||||
dpts-core.workspace = true
|
progress-pile-core.workspace = true
|
||||||
serde.workspace = true
|
serde.workspace = true
|
||||||
thiserror.workspace = true
|
thiserror.workspace = true
|
||||||
tokio.workspace = true
|
tokio.workspace = true
|
|
@ -2,7 +2,7 @@ mod storage;
|
||||||
|
|
||||||
use std::{fmt::{Display, Formatter}, path::{Path, PathBuf}, str::FromStr};
|
use std::{fmt::{Display, Formatter}, path::{Path, PathBuf}, str::FromStr};
|
||||||
|
|
||||||
pub use dpts_core::config::*;
|
pub use progress_pile_core::config::*;
|
||||||
pub use storage::*;
|
pub use storage::*;
|
||||||
|
|
||||||
use crate::error::Error;
|
use crate::error::Error;
|
7
progress-pile-client/src/lib.rs
Normal file
7
progress-pile-client/src/lib.rs
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
pub mod auth;
|
||||||
|
pub mod config;
|
||||||
|
|
||||||
|
pub use progress_pile_core::error;
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
[package]
|
[package]
|
||||||
name = "dpts-core"
|
name = "progress-pile-core"
|
||||||
version.workspace = true
|
version.workspace = true
|
||||||
edition.workspace = true
|
edition.workspace = true
|
||||||
license.workspace = true
|
license.workspace = true
|
||||||
|
@ -18,7 +18,7 @@ clap = { workspace = true, optional = true }
|
||||||
csv = "1.3.1"
|
csv = "1.3.1"
|
||||||
cynic = "3.10.0"
|
cynic = "3.10.0"
|
||||||
dotenv = {workspace = true}
|
dotenv = {workspace = true}
|
||||||
dpts-migration = { workspace = true }
|
progress-pile-server-migration = { workspace = true }
|
||||||
iana-time-zone = "0.1.63"
|
iana-time-zone = "0.1.63"
|
||||||
log = "0.4.27"
|
log = "0.4.27"
|
||||||
sea-orm.workspace = true
|
sea-orm.workspace = true
|
|
@ -4,7 +4,7 @@ use crate::config::{
|
||||||
};
|
};
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
use sea_orm::{entity::*, query::*, ConnectOptions, Database, DatabaseConnection};
|
use sea_orm::{entity::*, query::*, ConnectOptions, Database, DatabaseConnection};
|
||||||
use dpts_migration::{Migrator, MigratorTrait};
|
use progress_pile_server_migration::{Migrator, MigratorTrait};
|
||||||
|
|
||||||
use tokio::sync::OnceCell;
|
use tokio::sync::OnceCell;
|
||||||
|
|
||||||
|
@ -71,7 +71,7 @@ mod tests {
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
use chrono::{offset, FixedOffset, Local, TimeZone};
|
use chrono::{offset, FixedOffset, Local, TimeZone};
|
||||||
use sea_orm::{entity::*, query::*, ConnectOptions, Database};
|
use sea_orm::{entity::*, query::*, ConnectOptions, Database};
|
||||||
use dpts_migration::{Migrator, MigratorTrait};
|
use progress_pile_server_migration::{Migrator, MigratorTrait};
|
||||||
use crate::entity::*;
|
use crate::entity::*;
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
|
@ -1,13 +1,9 @@
|
||||||
[package]
|
[package]
|
||||||
name = "dpts-migration"
|
name = "progress-pile-server-migration"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
publish = false
|
publish = false
|
||||||
|
|
||||||
[lib]
|
|
||||||
name = "dpts_migration"
|
|
||||||
path = "src/lib.rs"
|
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
async-std = { version = "1", features = ["attributes", "tokio1"] }
|
async-std = { version = "1", features = ["attributes", "tokio1"] }
|
||||||
|
|
|
@ -2,5 +2,5 @@ use sea_orm_migration::prelude::*;
|
||||||
|
|
||||||
#[async_std::main]
|
#[async_std::main]
|
||||||
async fn main() {
|
async fn main() {
|
||||||
cli::run_cli(dpts_migration::Migrator).await;
|
cli::run_cli(progress_pile_server_migration::Migrator).await;
|
||||||
}
|
}
|
|
@ -1,5 +1,5 @@
|
||||||
[package]
|
[package]
|
||||||
name = "dpts-server"
|
name = "progress-pile-server"
|
||||||
version.workspace = true
|
version.workspace = true
|
||||||
license.workspace = true
|
license.workspace = true
|
||||||
edition.workspace = true
|
edition.workspace = true
|
||||||
|
@ -10,7 +10,7 @@ argon2 = "0.5.3"
|
||||||
async-graphql.workspace = true
|
async-graphql.workspace = true
|
||||||
axum = "0.8.4"
|
axum = "0.8.4"
|
||||||
clap = {workspace = true, features = ["derive"]}
|
clap = {workspace = true, features = ["derive"]}
|
||||||
dpts-core = {workspace = true}
|
progress-pile-core = {workspace = true}
|
||||||
chrono = {workspace = true}
|
chrono = {workspace = true}
|
||||||
serde.workspace = true
|
serde.workspace = true
|
||||||
thiserror.workspace = true
|
thiserror.workspace = true
|
|
@ -1,6 +1,6 @@
|
||||||
use crate::config::PartialServerConfig;
|
use crate::config::PartialServerConfig;
|
||||||
use clap::Parser;
|
use clap::Parser;
|
||||||
use dpts_core::config::{
|
use progress_pile_core::config::{
|
||||||
PartialDatabaseConfig,
|
PartialDatabaseConfig,
|
||||||
PartialGlobalConfig,
|
PartialGlobalConfig,
|
||||||
};
|
};
|
|
@ -1,6 +1,6 @@
|
||||||
use crate::error::Error;
|
use crate::error::Error;
|
||||||
|
|
||||||
use dpts_core::config::{
|
use progress_pile_core::config::{
|
||||||
DatabaseConfig, GlobalConfig, PartialDatabaseConfig
|
DatabaseConfig, GlobalConfig, PartialDatabaseConfig
|
||||||
};
|
};
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
|
@ -1,7 +1,7 @@
|
||||||
mod mutation;
|
mod mutation;
|
||||||
mod query;
|
mod query;
|
||||||
|
|
||||||
pub use dpts_core::graphql::*;
|
pub use progress_pile_core::graphql::*;
|
||||||
|
|
||||||
pub use mutation::Mutation;
|
pub use mutation::Mutation;
|
||||||
pub use query::Query;
|
pub use query::Query;
|
|
@ -1,5 +1,5 @@
|
||||||
use async_graphql::*;
|
use async_graphql::*;
|
||||||
use dpts_core::entity::UserModel;
|
use progress_pile_core::entity::UserModel;
|
||||||
|
|
||||||
use crate::{auth::try_hash_password, entity::UserActiveModel};
|
use crate::{auth::try_hash_password, entity::UserActiveModel};
|
||||||
|
|
|
@ -12,7 +12,7 @@ use async_graphql_axum::{
|
||||||
};
|
};
|
||||||
use axum::{routing::get, Router};
|
use axum::{routing::get, Router};
|
||||||
use crate::graphql::build_service;
|
use crate::graphql::build_service;
|
||||||
use dpts_core::entity as entity;
|
use progress_pile_core::entity as entity;
|
||||||
|
|
||||||
|
|
||||||
pub fn build_app() -> Router {
|
pub fn build_app() -> Router {
|
|
@ -1,7 +1,7 @@
|
||||||
use async_graphql::{http::{playground_source, GraphQLPlaygroundConfig}, *};
|
use async_graphql::{http::{playground_source, GraphQLPlaygroundConfig}, *};
|
||||||
use async_graphql_axum::GraphQL;
|
use async_graphql_axum::GraphQL;
|
||||||
|
|
||||||
use dpts_server::{build_app, Args};
|
use progress_pile_server::{build_app, Args};
|
||||||
use axum::{response::{Html, IntoResponse}, routing::get, Router};
|
use axum::{response::{Html, IntoResponse}, routing::get, Router};
|
||||||
use clap::Parser;
|
use clap::Parser;
|
||||||
|
|
Loading…
Add table
Reference in a new issue