diff --git a/Cargo.lock b/Cargo.lock index ef6c906..e6def95 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -467,38 +467,6 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" -[[package]] -name = "callout_dev" -version = "0.1.0" -dependencies = [ - "anyhow", - "askama", - "askama_axum", - "async-session", - "axum", - "axum-extra", - "base64 0.22.1", - "chrono", - "config", - "console_error_panic_hook", - "deadpool-diesel", - "diesel", - "dotenvy", - "futures", - "oauth2", - "rand", - "reqwest 0.12.8", - "serde", - "serde_json", - "tokio", - "tower", - "tower-http", - "tower-service", - "tracing", - "tracing-subscriber", - "uuid", -] - [[package]] name = "cc" version = "1.1.31" @@ -2260,6 +2228,38 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" +[[package]] +name = "shoutdotdev" +version = "0.1.0" +dependencies = [ + "anyhow", + "askama", + "askama_axum", + "async-session", + "axum", + "axum-extra", + "base64 0.22.1", + "chrono", + "config", + "console_error_panic_hook", + "deadpool-diesel", + "diesel", + "dotenvy", + "futures", + "oauth2", + "rand", + "reqwest 0.12.8", + "serde", + "serde_json", + "tokio", + "tower", + "tower-http", + "tower-service", + "tracing", + "tracing-subscriber", + "uuid", +] + [[package]] name = "slab" version = "0.4.9" diff --git a/Cargo.toml b/Cargo.toml index 3c69f3c..486b16f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,11 +1,8 @@ [package] -name = "callout_dev" +name = "shoutdotdev" version = "0.1.0" edition = "2021" -[unstable] -async_iterator = true - [dependencies] tower-service = "0.3.2" console_error_panic_hook = { version = "0.1.1" } diff --git a/dev-services/docker-compose.yaml b/dev-services/docker-compose.yaml index 6accbbb..6554ea8 100644 --- a/dev-services/docker-compose.yaml +++ b/dev-services/docker-compose.yaml @@ -1,4 +1,4 @@ -name: callout +name: shoutdotdev services: pg: diff --git a/dev-services/docker-entrypoint-initdb.d/init-callout.sql b/dev-services/docker-entrypoint-initdb.d/init-callout.sql deleted file mode 100644 index f9be506..0000000 --- a/dev-services/docker-entrypoint-initdb.d/init-callout.sql +++ /dev/null @@ -1,3 +0,0 @@ -CREATE USER callout WITH ENCRYPTED PASSWORD 'callous'; -CREATE DATABASE callout; -ALTER DATABASE callout OWNER TO callout; diff --git a/dev-services/docker-entrypoint-initdb.d/init-shoutdotdev.sql b/dev-services/docker-entrypoint-initdb.d/init-shoutdotdev.sql new file mode 100644 index 0000000..3c472fc --- /dev/null +++ b/dev-services/docker-entrypoint-initdb.d/init-shoutdotdev.sql @@ -0,0 +1,3 @@ +CREATE USER shoutdotdev WITH ENCRYPTED PASSWORD 'callous'; +CREATE DATABASE shoutdotdev; +ALTER DATABASE shoutdotdev OWNER TO shoutdotdev; diff --git a/diesel.toml b/diesel.toml index bc475ab..a0d61bf 100644 --- a/diesel.toml +++ b/diesel.toml @@ -6,4 +6,4 @@ file = "src/schema.rs" custom_type_derives = ["diesel::query_builder::QueryId", "Clone"] [migrations_directory] -dir = "/Users/brent-personal/Developer/callout_dev/migrations" +dir = "migrations" diff --git a/src/router.rs b/src/router.rs index d85a69d..aaeee0b 100644 --- a/src/router.rs +++ b/src/router.rs @@ -39,7 +39,7 @@ pub fn new_router(state: AppState) -> Router<()> { format!("{}", base_path).as_str(), Router::new() .route("/", get(landing_page)) - .nest("/v0", v0_router::new_router(state.clone())) + .merge(v0_router::new_router(state.clone())) .route("/teams", get(teams_page)) .route("/teams/{team_id}", get(team_page)) .route("/teams/{team_id}/projects", get(projects_page)) diff --git a/src/settings.rs b/src/settings.rs index 2e6de90..b0a3b25 100644 --- a/src/settings.rs +++ b/src/settings.rs @@ -43,7 +43,7 @@ pub struct Auth { } fn default_cookie_name() -> String { - "CALLOUT_SESSION".to_string() + "SHOUT_DOT_DEV_SESSION".to_string() } impl Settings { diff --git a/templates/base.html b/templates/base.html index 4b03b88..80113f9 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,7 +1,7 @@ - {% block title %}callout.dev{% endblock %} + {% block title %}Shout.dev{% endblock %} {% include "meta_tags.html" %} diff --git a/templates/nav.html b/templates/nav.html index da39bfb..069d8a0 100644 --- a/templates/nav.html +++ b/templates/nav.html @@ -1,6 +1,6 @@