feat: beginning of omnia

Signed-off-by: kjuulh <contact@kjuulh.io>

.drone.yml

@@ -1,88 +0,0 @@
-kind: pipeline
-name: default
-type: docker
-
-steps:
-  - name: load_secret
-    image: debian:buster-slim
-    volumes:
-      - name: ssh
-        path: /root/.ssh/
-    environment:
-      SSH_KEY:
-        from_secret: gitea_id_ed25519
-    commands:
-      - mkdir -p $HOME/.ssh/
-      - echo "$SSH_KEY" | base64 -d > $HOME/.ssh/id_ed25519
-
-  - name: build
-    image: kasperhermansen/cuddle:latest
-    pull: always
-    volumes:
-      - name: ssh
-        path: /root/.ssh/
-      - name: dockersock
-        path: /var/run
-    commands:
-      - apk add bash git
-      - git remote set-url origin $DRONE_GIT_SSH_URL
-      - cuddle_cli x setup_ssh
-      - cuddle_cli x start_deployment
-      - cuddle_cli x render_templates
-      - cuddle_cli x render_como_templates
-      - cuddle_cli x build_release
-      - cuddle_cli x push_release
-      - cuddle_cli x deploy_release
-    environment:
-      DOCKER_BUILDKIT: 1
-      DOCKER_USERNAME:
-        from_secret: docker_username
-      DOCKER_PASSWORD:
-        from_secret: docker_password
-      SSH_KEY:
-        from_secret: gitea_id_ed25519
-
-  - name: push_tags
-    image: kasperhermansen/drone-semantic-release:latest
-    pull: always
-    volumes:
-      - name: ssh
-        path: /root/.ssh/
-      - name: dockersock
-        path: /var/run
-    commands:
-      - semantic-release --no-ci
-    environment:
-      DOCKER_BUILDKIT: 1
-      SSH_KEY:
-        from_secret: gitea_id_ed25519
-    depends_on:
-      - build
-
-  - name: send telegram notification
-    image: appleboy/drone-telegram
-    settings:
-      token:
-        from_secret: telegram_token
-      to: 2129601481
-      format: markdown
-    depends_on:
-      - build
-      - push_tags
-    when:
-      status: [failure, success]
-
-services:
-- name: docker
-  image: docker:dind
-  privileged: true
-  volumes:
-  - name: dockersock
-    path: /var/run
-volumes:
-  - name: ssh
-    temp: {}
-  - name: dockersock
-    temp: {}
-
-

.env

@@ -1,4 +0,0 @@
-POSTGRES_DB=como
-POSTGRES_USER=como
-POSTGRES_PASSWORD=somenotverysecurepassword
-DATABASE_URL="postgres://como:somenotverysecurepassword@localhost:5432/como"

.gitignore

@@ -1,3 +1,2 @@
-/target
+target/
 .cuddle/
-node_modules/

.releaserc.yml

@@ -1,8 +0,0 @@
-branches: 
-  - "main"
-
-plugins:
-  - "@semantic-release/commit-analyzer"
-  - "@semantic-release/release-notes-generator"
-  - "@semantic-release/changelog"
-  - "@semantic-release/git"

Cargo.toml

@@ -1,2 +1,3 @@
 [workspace]
-members = ["como_bin", "como_core", "como_domain", "como_infrastructure"]
+members = [ "crates/*" ]
+resolver = "2"

README.md

@@ -1,3 +1,76 @@
-# Cibus Backend
+# Omnia
 
-Some text
+`Omnia` is a tool to provide a common platform for everything. It is a tool
+build to support note-taking, handling personal relationships, project
+development, todos, research, up-keep of external work, and much more.
+
+This may seem like a large list of tasks, and it is. However, Omnia is designed
+to be opinionated, and provide a minimalistic approach to each of the above.
+Omnia is not a general purpose tool, text editing tool, it is designed to fit
+into your existing toolstack, with its opinionated project structure, and
+workflow.
+
+Alternatives to this tool:
+
+- Notion: with second brain templates etc.
+- Obsidian: with zen garden templates etc.
+
+Omnia is a commandline tool, which functions using a terminal ui, or pure cli
+commands. Called `interactive` for the former, and `prompt` for the latter. It
+is designed to work with your favorite EDITOR, to keep the scope of this project
+reasonable, `Omnia` doesn't try to bundle with an editor. Instead it will
+respect your `OMNIA_EDITOR`, or `EDITOR` environment variables, and launch the
+files using those.
+
+## How to use `Omnia`
+
+To launch the fully interactive view, simply type `omnia` in your shell of
+choice. This will boot up the TUI, press `?` for help and it will show a brief,
+menu as well as the most common keybinds.
+
+Following each command will be shown separately, these will be available in the
+UI as well, just follow along in the menu, or use the command key `:` to open
+the command palette.
+
+### Commands
+
+In Omnia everything is designed to use Markdown files, even the templates are
+markdown files, though with some special syntax to make prompting easier. This
+also means that you can open your local ~/omnia directory using your favorite
+editor, as everything is just markdown files.
+
+Projects are the cornerstone of how Omnia functions. Every navigation item is a
+project, be they todo lists, research items, external sites etc. Projects can be
+nested, and projects can contain pages. External apps can be configured as a
+project, and will need a certain interface to be functional.
+
+This means that when you type a command:
+
+`omnia --help`, each subcommand will be a project, some keywords are reserved:
+(todo, inbox, project, etc.), each project decides which commands are available,
+and this is fully customizeable, through our plugin system. Though note that we
+ship the default view with a set of preconfigured plugins:
+
+- todo
+- inbox
+- projects
+- areas
+
+Typing each of the commands above will open the fully interactive tui:
+`omnia todo`. Todo has a set of commands available to it: `omnia todo create` as
+an example. This will open the prompt view, which will interactive ask the user
+to fill out a form. These questions will also be available using commandline
+flags as well.
+
+### Views
+
+Some of the projects are built as views, this may be a list of recent
+notifications on github, apis of interest, metrics and whatnot.
+
+## Remote first
+
+Omnia will sync remote first in nearly all cases. The only exception is in
+progress forms and whatnot. This is to keep complexity down, as well as making
+sure Omnia is as easily crossplatform as possible. You should be able to use
+`Omnia` from all your terminal capable devices. This sprung out of my own need
+for having my notes available everywhere, without having conflicts.

como_bin/Cargo.toml

@@ -1,36 +0,0 @@
-[package]
-name = "como_bin"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-como_core = { path = "../como_core" }
-como_domain = { path = "../como_domain" }
-como_infrastructure = { path = "../como_infrastructure" }
-
-async-graphql = "4.0.6"
-async-graphql-axum = "*"
-axum = "0.5.13"
-axum-extra = { version = "*", features = ["cookie", "cookie-private"] }
-axum-sessions = { version = "*" }
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0.68"
-tokio = { version = "1.20.1", features = ["full"] }
-uuid = { version = "1.1.2", features = ["v4", "fast-rng"] }
-sqlx = { version = "0.6", features = [
-  "runtime-tokio-rustls",
-  "postgres",
-  "migrate",
-  "uuid",
-  "offline",
-] }
-anyhow = "1.0.60"
-dotenv = "0.15.0"
-tracing = "0.1.36"
-tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
-tower-http = { version = "0.3.4", features = ["full"] }
-argon2 = "0.4"
-rand_core = { version = "0.6", features = ["std"] }
-cookie = { version = "0.16", features = ["secure", "percent-encode"] }

como_bin/build.rs

@@ -1,6 +0,0 @@
-// generated by `sqlx migrate build-script`
-fn main() {
-    // trigger recompilation when a new migration is added
-    println!("cargo:rerun-if-changed=migrations");
-}
-

como_bin/sqlx-data.json

@@ -1,56 +0,0 @@
-{
-  "db": "PostgreSQL",
-  "3b4484c5ccfd4dcb887c4e978fe6e45d4c9ecc2a73909be207dced79ddf17d87": {
-    "describe": {
-      "columns": [
-        {
-          "name": "id",
-          "ordinal": 0,
-          "type_info": "Uuid"
-        }
-      ],
-      "nullable": [
-        false
-      ],
-      "parameters": {
-        "Left": [
-          "Varchar",
-          "Varchar"
-        ]
-      }
-    },
-    "query": "\n            INSERT INTO users (username, password_hash) \n            VALUES ( $1, $2 ) \n            RETURNING id\n            "
-  },
-  "d3f222cf6c3d9816705426fdbed3b13cb575bb432eb1f33676c0b414e67aecaf": {
-    "describe": {
-      "columns": [
-        {
-          "name": "id",
-          "ordinal": 0,
-          "type_info": "Uuid"
-        },
-        {
-          "name": "username",
-          "ordinal": 1,
-          "type_info": "Varchar"
-        },
-        {
-          "name": "password_hash",
-          "ordinal": 2,
-          "type_info": "Varchar"
-        }
-      ],
-      "nullable": [
-        false,
-        false,
-        false
-      ],
-      "parameters": {
-        "Left": [
-          "Text"
-        ]
-      }
-    },
-    "query": "\n            SELECT * from users\n            where username=$1\n            "
-  }
-}

como_bin/src/error.rs

@@ -1,21 +0,0 @@
-use axum::{http::StatusCode, response::IntoResponse, Json};
-use serde_json::json;
-
-#[derive(Debug)]
-pub enum AppError {
-    WrongCredentials,
-    InternalServerError,
-}
-
-impl IntoResponse for AppError {
-    fn into_response(self) -> axum::response::Response {
-        let (status, err_msg) = match self {
-            Self::WrongCredentials => (StatusCode::BAD_REQUEST, "invalid credentials"),
-            Self::InternalServerError => (
-                StatusCode::INTERNAL_SERVER_ERROR,
-                "something went wrong with your request",
-            ),
-        };
-        (status, Json(json!({ "error": err_msg }))).into_response()
-    }
-}

como_bin/src/gqlx/mod.rs

@@ -1,2 +0,0 @@
-pub mod users;
-

como_bin/src/graphql.rs

@@ -1,57 +0,0 @@
-use async_graphql::{Context, EmptySubscription, Object, Schema};
-
-use como_domain::item::{requests::CreateItemDto, responses::CreatedItemDto};
-
-use crate::services::users_service::UserService;
-
-pub type CibusSchema = Schema<QueryRoot, MutationRoot, EmptySubscription>;
-
-pub struct MutationRoot;
-
-#[Object]
-impl MutationRoot {
-    async fn login(
-        &self,
-        ctx: &Context<'_>,
-        username: String,
-        password: String,
-    ) -> anyhow::Result<bool> {
-        let user_service = ctx.data_unchecked::<UserService>();
-
-        let valid = user_service.validate_user(username, password).await?;
-        let returnvalid = match valid {
-            Some(..) => true,
-            None => false,
-        };
-
-        Ok(returnvalid)
-    }
-
-    async fn register(
-        &self,
-        ctx: &Context<'_>,
-        username: String,
-        password: String,
-    ) -> anyhow::Result<String> {
-        let user_service = ctx.data_unchecked::<UserService>();
-
-        let user_id = user_service.add_user(username, password).await?;
-
-        Ok(user_id)
-    }
-
-    async fn create_item(
-        &self,
-        ctx: &Context<'_>,
-        item: CreateItemDto,
-    ) -> anyhow::Result<CreatedItemDto> {
-        let services_register = ctx.data_unchecked::<ServiceRegister>()
-    }
-}
-
-pub struct QueryRoot;
-
-#[Object]
-impl QueryRoot {
-    async fn get_upcoming(&self, _ctx: &Context<'_>) -> Vec<Event> {}
-}

como_bin/src/main.rs

@@ -1,176 +0,0 @@
-use std::env::{self, current_dir};
-
-mod error;
-mod gqlx;
-mod graphql;
-mod services;
-
-use async_graphql_axum::{GraphQLRequest, GraphQLResponse};
-use axum::{
-    extract::Extension,
-    http::{Method, StatusCode},
-    response::{Html, IntoResponse},
-    routing::{get, post},
-    Json, Router,
-};
-use axum_extra::extract::cookie::Key;
-
-use async_graphql::{
-    http::{playground_source, GraphQLPlaygroundConfig},
-    EmptySubscription, Schema,
-};
-use axum_sessions::{
-    async_session::MemoryStore,
-    extractors::{ReadableSession, WritableSession},
-    SessionLayer,
-};
-use error::AppError;
-use graphql::CibusSchema;
-use serde::{Deserialize, Serialize};
-use serde_json::{json, Value};
-use services::users_service;
-use sqlx::PgPool;
-use tower_http::{cors::CorsLayer, trace::TraceLayer};
-use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
-
-use crate::graphql::{MutationRoot, QueryRoot};
-
-async fn graphql_handler(
-    schema: Extension<CibusSchema>,
-    session: ReadableSession,
-    req: GraphQLRequest,
-) -> Result<GraphQLResponse, StatusCode> {
-    let req = req.into_inner();
-
-    //if let Some(user_id) = session.get::<String>("userId") {
-    //   req = req.data(user_id);
-    return Ok(schema.execute(req).await.into());
-    //} else if let Some(on) = &req.operation_name {
-    //    if on == "IntrospectionQuery" {
-    //        return Ok(schema.execute(req).await.into());
-    //    }
-    //}
-
-    //Err(StatusCode::FORBIDDEN)
-}
-
-async fn graphql_playground() -> impl IntoResponse {
-    Html(playground_source(GraphQLPlaygroundConfig::new("/")))
-}
-
-#[tokio::main]
-async fn main() -> anyhow::Result<()> {
-    // Environment
-    tracing::info!("Loading dotenv");
-    dotenv::dotenv()?;
-
-    // Logging
-    tracing_subscriber::registry()
-        .with(tracing_subscriber::EnvFilter::new(
-            std::env::var("RUST_LOG").unwrap_or_else(|_| {
-                "como_bin=debug,tower_http=debug,axum_extra=debug,hyper=info,mio=info,sqlx=info,async_graphql=debug"
-                    .into()
-            }),
-        ))
-        .with(tracing_subscriber::fmt::layer())
-        .init();
-
-    // Database
-    tracing::info!("Creating pool");
-    let db_url = env::var("DATABASE_URL")?;
-    let pool = PgPool::connect(&db_url).await?;
-
-    // Database Migrate
-    tracing::info!("Migrating db");
-    sqlx::migrate!("db/migrations").run(&pool).await?;
-
-    tracing::info!("current path: {}", current_dir()?.to_string_lossy());
-
-    // Schema
-    println!("Building schema");
-    let schema = Schema::build(QueryRoot, MutationRoot, EmptySubscription)
-        .data(users_service::UserService::new(pool.clone()))
-        .finish();
-
-    // CORS
-    let cors = vec!["http://localhost:3000".parse().unwrap()];
-
-    // Key
-    let key = Key::generate();
-
-    let store = MemoryStore::new();
-    let session_layer = SessionLayer::new(store, key.master());
-
-    // Webserver
-    tracing::info!("Building router");
-    let app = Router::new()
-        .route("/", get(graphql_playground).post(graphql_handler))
-        .route("/auth/login", post(login))
-        .route("/auth/register", post(register))
-        .layer(TraceLayer::new_for_http())
-        .layer(Extension(schema))
-        .layer(Extension(key))
-        .layer(Extension(pool))
-        .layer(session_layer)
-        .layer(
-            CorsLayer::new()
-                .allow_origin(cors)
-                .allow_headers([axum::http::header::CONTENT_TYPE])
-                .allow_methods([Method::GET, Method::POST, Method::OPTIONS]),
-        );
-
-    tracing::info!("Starting webserver");
-    axum::Server::bind(&"0.0.0.0:3001".parse().unwrap())
-        .serve(app.into_make_service())
-        .await
-        .unwrap();
-
-    Ok(())
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct Credentials {
-    pub username: String,
-    pub password: String,
-}
-
-async fn login(
-    Json(credentials): Json<Credentials>,
-    Extension(pool): Extension<PgPool>,
-    mut session: WritableSession,
-) -> Result<Json<Value>, error::AppError> {
-    let us = users_service::UserService::new(pool);
-    match us
-        .validate_user(credentials.username, credentials.password)
-        .await
-        .map_err(|e| {
-            tracing::error!("could not validate user: {}", e);
-
-            AppError::InternalServerError
-        })? {
-        Some(user_id) => {
-            if let Err(e) = session.insert("userId", user_id.clone()) {
-                tracing::error!("could not insert session: {}", e);
-                return Err(AppError::InternalServerError);
-            }
-
-            Ok(Json(json!({ "userId": user_id })))
-        }
-        None => Err(AppError::WrongCredentials),
-    }
-}
-async fn register(
-    Json(credentials): Json<Credentials>,
-    Extension(pool): Extension<PgPool>,
-) -> Result<Json<Value>, error::AppError> {
-    let us = users_service::UserService::new(pool)
-        .add_user(credentials.username, credentials.password)
-        .await
-        .map_err(|e| {
-            tracing::error!("could not add user: {}", e);
-
-            AppError::InternalServerError
-        })?;
-
-    Ok(Json(json!({ "userId": us })))
-}

como_bin/src/services/mod.rs

@@ -1 +0,0 @@
-pub mod users_service;

como_bin/src/services/users_service.rs

@@ -1,78 +0,0 @@
-use anyhow::anyhow;
-use argon2::{password_hash::SaltString, Argon2, PasswordHash, PasswordHasher, PasswordVerifier};
-use rand_core::OsRng;
-use sqlx::{Pool, Postgres};
-
-pub struct UserService {
-    pgx: Pool<Postgres>,
-}
-
-impl UserService {
-    pub fn new(pgx: Pool<Postgres>) -> Self {
-        Self { pgx }
-    }
-
-    pub async fn add_user(&self, username: String, password: String) -> anyhow::Result<String> {
-        let hashed_password = self.hash_password(password)?;
-
-        let rec = sqlx::query!(
-            r#"
-            INSERT INTO users (username, password_hash) 
-            VALUES ( $1, $2 ) 
-            RETURNING id
-            "#,
-            username,
-            hashed_password
-        )
-        .fetch_one(&self.pgx)
-        .await?;
-
-        Ok(rec.id.to_string())
-    }
-
-    pub async fn validate_user(
-        &self,
-        username: String,
-        password: String,
-    ) -> anyhow::Result<Option<String>> {
-        let rec = sqlx::query!(
-            r#"
-            SELECT * from users
-            where username=$1
-            "#,
-            username,
-        )
-        .fetch_optional(&self.pgx)
-        .await?;
-
-        match rec {
-            Some(user) => match self.validate_password(password, user.password_hash)? {
-                true => Ok(Some(user.id.to_string())),
-                false => Ok(None),
-            },
-            None => Ok(None),
-        }
-    }
-
-    fn hash_password(&self, password: String) -> anyhow::Result<String> {
-        let salt = SaltString::generate(&mut OsRng);
-        let argon2 = Argon2::default();
-
-        let password_hash = argon2
-            .hash_password(password.as_bytes(), &salt)
-            .map_err(|e| anyhow!(e))?
-            .to_string();
-
-        Ok(password_hash)
-    }
-
-    fn validate_password(&self, password: String, hashed_password: String) -> anyhow::Result<bool> {
-        let argon2 = Argon2::default();
-
-        let parsed_hash = PasswordHash::new(&hashed_password).map_err(|e| anyhow!(e))?;
-        match argon2.verify_password(password.as_bytes(), &parsed_hash) {
-            Ok(..) => Ok(true),
-            Err(..) => Ok(false),
-        }
-    }
-}

como_bin/target/sqlx/query-4e07408562bedb8b60ce05c1decfe3ad16b72230967de01f640b7e4729b49fce.json

@@ -1,33 +0,0 @@
-{
-  "query": "\n            SELECT * from users\n            where username=$1\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "id",
-        "type_info": "Uuid"
-      },
-      {
-        "ordinal": 1,
-        "name": "username",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 2,
-        "name": "password_hash",
-        "type_info": "Varchar"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Text"
-      ]
-    },
-    "nullable": [
-      false,
-      false,
-      false
-    ]
-  },
-  "hash": "d3f222cf6c3d9816705426fdbed3b13cb575bb432eb1f33676c0b414e67aecaf"
-}

como_core/Cargo.toml

@@ -1,30 +0,0 @@
-[package]
-name = "como_core"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-tokio = { version = "1", features = ["full"] }
-axum = "0.5.1"
-
-# utilty crates
-serde = { version = "1.0.136", features = ["derive"] }
-sqlx = { version = "0.5", features = [
-  "runtime-tokio-rustls",
-  "postgres",
-  "time",
-] }
-serde_json = "1.0.81"
-dotenv = "0.15.0"
-tracing = "0.1"
-tracing-subscriber = "0.3"
-anyhow = "1"
-validator = { version = "0.15", features = ["derive"] }
-async-trait = "0.1"
-thiserror = "1"
-rust-argon2 = "1.0"
-clap = { version = "3", features = ["derive", "env"] }
-mockall = "0.11.1"
-time = "0.2"

como_core/src/items/mod.rs

@@ -1,8 +0,0 @@
-use std::sync::Arc;
-
-use async_trait::async_trait;
-
-pub type DynItemService = Arc<dyn ItemService + Send + Sync>;
-
-#[async_trait]
-pub trait ItemService {}

como_core/src/lib.rs

@@ -1,3 +0,0 @@
-pub mod items;
-pub mod projects;
-pub mod users;

como_core/src/projects/mod.rs

@@ -1,8 +0,0 @@
-use std::sync::Arc;
-
-use async_trait::async_trait;
-
-pub type DynProjectService = Arc<dyn ProjectService + Send + Sync>;
-
-#[async_trait]
-pub trait ProjectService {}

como_core/src/users/mod.rs

@@ -1,8 +0,0 @@
-use std::sync::Arc;
-
-use async_trait::async_trait;
-
-pub type DynUserService = Arc<dyn UserService + Send + Sync>;
-
-#[async_trait]
-pub trait UserService {}

como_domain/Cargo.toml

@@ -1,12 +0,0 @@
-[package]
-name = "como_domain"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-anyhow = "1.0.60"
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0.68"
-uuid = { version = "1.1.2", features = ["v4", "fast-rng", "serde"] }

como_domain/src/item/mod.rs

@@ -1,21 +0,0 @@
-pub mod requests;
-pub mod responses;
-
-use serde::{Deserialize, Serialize};
-use uuid::Uuid;
-
-#[derive(Debug, Deserialize, Serialize)]
-pub enum ItemState {
-    Created,
-    Done,
-    Archived,
-    Deleted,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct ItemDto {
-    pub id: Uuid,
-    pub title: String,
-    pub description: Option<String>,
-    pub state: ItemState,
-}

como_domain/src/item/requests.rs

@@ -1,6 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct CreateItemDto {
-    pub name: String,
-}

como_domain/src/item/responses.rs

@@ -1,3 +0,0 @@
-use super::ItemDto;
-
-pub type CreatedItemDto = ItemDto;

como_domain/src/lib.rs

@@ -1,3 +0,0 @@
-pub mod item;
-pub mod projects;
-pub mod users;

como_domain/src/projects/mod.rs

@@ -1,11 +0,0 @@
-pub mod requests;
-pub mod responses;
-
-use serde::{Deserialize, Serialize};
-use uuid::Uuid;
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct ProjectDto {
-    pub id: Uuid,
-    pub name: String,
-}

como_domain/src/projects/requests.rs

@@ -1,6 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-#[derive(Serialize, Deserialize)]
-pub struct CreateProjectDto {
-    pub name: String,
-}

como_domain/src/projects/responses.rs

@@ -1,3 +0,0 @@
-use super::ProjectDto;
-
-pub type CreatedProjectDto = ProjectDto;

como_domain/src/users/mod.rs

@@ -1,12 +0,0 @@
-pub mod requests;
-pub mod responses;
-
-use serde::{Deserialize, Serialize};
-use uuid::Uuid;
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct UserDto {
-    pub id: Uuid,
-    pub username: String,
-    pub email: String,
-}

como_domain/src/users/requests.rs

@@ -1,8 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-#[derive(Serialize, Deserialize)]
-pub struct CreateUserDto {
-    pub username: String,
-    pub email: String,
-    pub password: String,
-}

como_domain/src/users/responses.rs

@@ -1,3 +0,0 @@
-use super::UserDto;
-
-pub type UserCreatedDto = UserDto;

como_infrastructure/Cargo.toml

@@ -1,36 +0,0 @@
-[package]
-name = "como_infrastructure"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-como_core = { path = "../como_core" }
-como_domain = { path = "../como_domain" }
-
-async-graphql = "4.0.6"
-async-graphql-axum = "*"
-axum = "0.5.13"
-axum-extra = { version = "*", features = ["cookie", "cookie-private"] }
-axum-sessions = { version = "*" }
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0.68"
-tokio = { version = "1.20.1", features = ["full"] }
-uuid = { version = "1.1.2", features = ["v4", "fast-rng"] }
-sqlx = { version = "0.6", features = [
-  "runtime-tokio-rustls",
-  "postgres",
-  "migrate",
-  "uuid",
-  "offline",
-] }
-anyhow = "1.0.60"
-dotenv = "0.15.0"
-tracing = "0.1.36"
-tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
-tower-http = { version = "0.3.4", features = ["full"] }
-argon2 = "0.4"
-rand_core = { version = "0.6", features = ["std"] }
-cookie = { version = "0.16", features = ["secure", "percent-encode"] }
-clap = { version = "3", features = ["derive", "env"] }

como_infrastructure/migrations/20220808220223_initial_migration.sql

@@ -1,8 +0,0 @@
--- Add migration script here
-CREATE TABLE IF NOT EXISTS users (
-  id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
-  username varchar not null,
-  password_hash varchar not null
-);
-
-CREATE unique index users_username_idx on users(username)

como_infrastructure/src/configs/mod.rs

@@ -1,18 +0,0 @@
-#[derive(clap::Parser)]
-pub struct AppConfig {
-    #[clap(long, env)]
-    pub database_url: String,
-    #[clap(long, env)]
-    pub rust_log: String,
-    #[clap(long, env)]
-    pub token_secret: String,
-    #[clap(long, env)]
-    pub port: u32,
-    #[clap(long, env)]
-    pub run_migrations: bool,
-    #[clap(long, env)]
-    pub seed: bool,
-    #[clap(long, env)]
-    pub cors_origin: String,
-}
-

como_infrastructure/src/database/mod.rs

@@ -1,33 +0,0 @@
-use anyhow::Context;
-use sqlx::{postgres::PgPoolOptions, Pool, Postgres};
-use tracing::log::info;
-
-pub type ConnectionPool = Pool<Postgres>;
-
-pub struct ConnectionPoolManager;
-
-impl ConnectionPoolManager {
-    pub async fn new_pool(
-        connection_string: &str,
-        run_migrations: bool,
-    ) -> anyhow::Result<ConnectionPool> {
-        info!("initializing the database connection pool");
-        let pool = PgPoolOptions::new()
-            .max_connections(5)
-            .connect(connection_string)
-            .await
-            .context("error while initializing the database connection pool")?;
-
-        if run_migrations {
-            info!("migrations enabled");
-            info!("migrating database");
-
-            sqlx::migrate!()
-                .run(&pool)
-                .await
-                .context("error while running database migrations");
-        }
-
-        Ok(pool)
-    }
-}

como_infrastructure/src/lib.rs

@@ -1,5 +0,0 @@
-pub mod configs;
-pub mod database;
-pub mod register;
-pub mod repositories;
-pub mod services;

como_infrastructure/src/register.rs

@@ -1,38 +0,0 @@
-use std::sync::Arc;
-
-use como_core::{items::DynItemService, projects::DynProjectService, users::DynUserService};
-use tracing::log::info;
-
-use crate::{
-    configs::AppConfig,
-    database::ConnectionPool,
-    services::{
-        item_service::DefaultItemService, project_service::DefaultProjectService,
-        user_service::DefaultUserService,
-    },
-};
-
-#[derive(Clone)]
-pub struct ServiceRegister {
-    pub item_service: DynItemService,
-    pub project_service: DynProjectService,
-    pub user_service: DynUserService,
-}
-
-impl ServiceRegister {
-    pub fn new(_pool: ConnectionPool, _config: AppConfig) -> Self {
-        info!("creating services");
-
-        let item_service = Arc::new(DefaultItemService::new()) as DynItemService;
-        let project_service = Arc::new(DefaultProjectService::new()) as DynProjectService;
-        let user_service = Arc::new(DefaultUserService::new()) as DynUserService;
-
-        info!("services created succesfully");
-
-        return Self {
-            item_service,
-            user_service,
-            project_service,
-        };
-    }
-}

como_infrastructure/src/services/item_service.rs

@@ -1,11 +0,0 @@
-use como_core::items::ItemService;
-
-pub struct DefaultItemService {}
-
-impl DefaultItemService {
-    pub fn new() -> Self {
-        Self {}
-    }
-}
-
-impl ItemService for DefaultItemService {}

como_infrastructure/src/services/mod.rs

@@ -1,3 +0,0 @@
-pub mod item_service;
-pub mod project_service;
-pub mod user_service;

como_infrastructure/src/services/project_service.rs

@@ -1,11 +0,0 @@
-use como_core::projects::ProjectService;
-
-pub struct DefaultProjectService {}
-
-impl DefaultProjectService {
-    pub fn new() -> Self {
-        Self {}
-    }
-}
-
-impl ProjectService for DefaultProjectService {}

como_infrastructure/src/services/user_service.rs

@@ -1,11 +0,0 @@
-use como_core::users::UserService;
-
-pub struct DefaultUserService {}
-
-impl DefaultUserService {
-    pub fn new() -> Self {
-        Self {}
-    }
-}
-
-impl UserService for DefaultUserService {}

crates/omnia/.gitignore

@@ -0,0 +1 @@
+/target

crates/omnia/Cargo.toml

@@ -0,0 +1,15 @@
+[package]
+name = "omnia"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+clap = { version = "4.4.11", features = ["string"] }
+color-eyre = "0.6.2"
+eyre = "0.6.10"
+tokio = { version = "1.35.0", features = ["full"] }
+tracing = { version = "0.1.40", features = ["log"] }
+tracing-subscriber = { version = "0.3.18", features = ["tracing"] }
+uuid = { version = "1.6.1", features = ["v4"] }

crates/omnia/src/main.rs

@@ -0,0 +1,94 @@
+use cli::CliCommand;
+use inbox::services::Inbox;
+
+#[tokio::main]
+async fn main() -> eyre::Result<()> {
+    tracing_subscriber::fmt().init();
+
+    if let Err(e) = color_eyre::install() {
+        tracing::error!("failed to install color_eyre: {}", e);
+    }
+
+    let cmd = clap::Command::new("omnia");
+
+    let inbox = Inbox::new();
+    let cmd = cmd.subcommand(inbox.get_command());
+
+    let matches = cmd.get_matches();
+    match matches.subcommand() {
+        Some((name, args)) => {
+            tracing::debug!("executing: {}", name);
+            if inbox.matches_command(name) {
+                inbox.execute_command(args).await?;
+            }
+        }
+        None => {
+            tracing::info!("executing raw command")
+        }
+    }
+
+    Ok(())
+}
+
+pub mod cli {
+    use clap::{ArgMatches, Command};
+
+    pub trait CliCommand {
+        fn get_name(&self) -> String;
+        fn get_command(&self) -> Command {
+            Command::new(self.get_name())
+        }
+        fn matches_command(&self, name: &str) -> bool {
+            name == self.get_name()
+        }
+        async fn execute_command(&self, args: &ArgMatches) -> eyre::Result<()>;
+    }
+}
+
+pub mod inbox {
+    pub mod cli {}
+
+    pub mod domain {
+        #[derive(Debug, Clone)]
+        pub struct InboxItem {
+            pub title: String,
+            pub description: Option<String>,
+            pub project: Option<String>,
+        }
+    }
+
+    pub mod services {
+        use crate::cli::CliCommand;
+
+        use super::domain::*;
+
+        pub struct Inbox {}
+
+        impl Inbox {
+            pub fn new() -> Self {
+                Self {}
+            }
+
+            pub async fn add_item(&self, inbox_item: InboxItem) -> eyre::Result<uuid::Uuid> {
+                Ok(uuid::Uuid::new_v4())
+            }
+        }
+
+        impl CliCommand for Inbox {
+            fn get_name(&self) -> String {
+                "inbox".to_string()
+            }
+
+            async fn execute_command(&self, args: &clap::ArgMatches) -> eyre::Result<()> {
+                self.add_item(InboxItem {
+                    title: "something".into(),
+                    description: Some("description".into()),
+                    project: Some("project".into()),
+                })
+                .await?;
+
+                Ok(())
+            }
+        }
+    }
+}

cuddle.yaml

@@ -1,19 +0,0 @@
-# yaml-language-server: $schema=https://git.front.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
-
-base: "git@git.front.kjuulh.io:kjuulh/cuddle-rust-plan.git"
-
-vars:
-  service: "como-backend"
-  deployments: "git@git.front.kjuulh.io:como/deployments.git"
-
-scripts:
-  render_como_templates:
-    type: shell
-  local_up:
-    type: shell
-  local_down:
-    type: shell
-  run_como:
-    type: shell
-  migrate_como:
-    type: shell

scripts/local_down.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -e
-
-cuddle_cli render_template --template-file $TMP/docker-compose.local_up.yml.tmpl --dest $TMP/docker-compose.local_up.yml
-
-docker compose -f $TMP/docker-compose.local_up.yml down -v

scripts/local_up.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -e
-
-cuddle_cli render_template --template-file $TMP/docker-compose.local_up.yml.tmpl --dest $TMP/docker-compose.local_up.yml
-
-docker compose -f $TMP/docker-compose.local_up.yml up -d --remove-orphans --build

scripts/migrate_como.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-export $(cat .env | xargs)
-
-cargo sqlx migrate run --source como_infrastructure/migrations --database-url=$DATABASE_URL
-

scripts/render_como_templates.sh

@@ -1,10 +0,0 @@
-#!/bin/bash                                                                                                                                 
-
-set -e
-
-deploymentrepo="$TMP/deployments"
-
-CUDDLE_FETCH_POLICY=never cuddle_cli render_template \
-  --template-file "$TMP/.env.example.tmpl" \
-  --dest "$deploymentrepo/$SERVICE/env.example"
-

scripts/run_como.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -e
-
-cargo run como_bin/

templates/.env.example.tmpl

@@ -1,4 +0,0 @@
-POSTGRES_DB=como
-POSTGRES_USER=como
-POSTGRES_PASSWORD=somenotverysecurepassword
-DATABASE_URL="postgres://como:somenotverysecurepassword@localhost:5432/como"

templates/docker-compose.local_up.dockerignore

@@ -1,7 +0,0 @@
-target/
-.git/
-.cuddle/
-scripts/
-cuddle.yaml
-local.sh
-README.md

templates/docker-compose.local_up.yml.tmpl

@@ -1,17 +0,0 @@
-version: '3.7'
-
-services:
-  db:
-    build:
-      context: .
-      dockerfile: local_up.Dockerfile
-    restart: always
-    environment:
-    - POSTGRES_PASSWORD=somenotverysecurepassword
-    ports:
-    - 5432:5432
-    volumes:
-    - pgdata:/var/lib/postgresql/data
-
-volumes:
-  pgdata:

templates/init-user-db.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-set -e
-
-psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
-	CREATE USER como WITH PASSWORD 'somenotverysecurepassword';
-	CREATE DATABASE como;
-	GRANT ALL PRIVILEGES ON DATABASE como TO como;
-EOSQL

templates/local_up.Dockerfile

@@ -1,3 +0,0 @@
-FROM postgres:14-alpine
-
-COPY *.sh /docker-entrypoint-initdb.d/