extract cli and migrations into modules

Cargo.toml

@@ -27,7 +27,7 @@ serde = { version = "1.0.213", features = ["derive"] }
 serde_json = "1.0.132"
 tokio = { version = "1.42.0", features = ["full"] }
 tower = "0.5.2"
-tower-http = { version = "0.6.2", features = ["compression-gzip", "fs", "normalize-path", "set-header", "trace"] }
+tower-http = { version = "0.6.2", features = ["compression-gzip", "fs", "normalize-path", "trace"] }
 tracing = "0.1.40"
 tracing-subscriber = { version = "0.3.19", features = ["chrono", "env-filter"] }
 uuid = { version = "1.11.0", features = ["serde", "v4", "v7"] }

src/app_state.rs

@@ -68,26 +68,20 @@ pub type AppState = Arc<App>;
 #[derive(Clone)]
 pub struct ReqwestClient(pub reqwest::Client);
 
-impl<S> FromRef<S> for ReqwestClient
+impl FromRef<AppState> for ReqwestClient {
-where
+    fn from_ref(state: &AppState) -> Self {
-    S: Into<AppState> + Clone,
+        ReqwestClient(state.reqwest_client.clone())
-{
-    fn from_ref(state: &S) -> Self {
-        ReqwestClient(Into::<AppState>::into(state.clone()).reqwest_client.clone())
     }
 }
 
 /// Extractor to automatically obtain a Deadpool database connection
 pub struct DbConn(pub Connection);
 
-impl<S> FromRequestParts<S> for DbConn
+impl FromRequestParts<AppState> for DbConn {
-where
-    S: Into<AppState> + Clone + Sync,
-{
     type Rejection = AppError;
 
-    async fn from_request_parts(_: &mut Parts, state: &S) -> Result<Self, Self::Rejection> {
+    async fn from_request_parts(_: &mut Parts, state: &AppState) -> Result<Self, Self::Rejection> {
-        let conn = Into::<AppState>::into(state.clone()).db_pool.get().await?;
+        let conn = state.db_pool.get().await?;
         Ok(Self(conn))
     }
 }

src/channels_router.rs

@@ -158,7 +158,7 @@ async fn post_new_channel(
     };
 
     Ok(Redirect::to(&format!(
-        "{}/en/teams/{}/channels/{}",
+        "{}/teams/{}/channels/{}",
         base_path,
         team.id.simple(),
         channel.id.simple()
@@ -276,7 +276,7 @@ async fn update_channel(
         ));
     }
     Ok(Redirect::to(&format!(
-        "{}/en/teams/{}/channels/{}",
+        "{}/teams/{}/channels/{}",
         base_path,
         team_id.simple(),
         channel_id.simple()
@@ -366,7 +366,7 @@ async fn update_channel_email_recipient(
     mailer.send_batch(vec![email]).await.remove(0)?;
 
     Ok(Redirect::to(&format!(
-        "{}/en/teams/{}/channels/{}",
+        "{}/teams/{}/channels/{}",
         base_path,
         team_id.simple(),
         channel_id.simple()
@@ -447,7 +447,7 @@ async fn verify_email(
     };
 
     Ok(Redirect::to(&format!(
-        "{}/en/teams/{}/channels/{}",
+        "{}/teams/{}/channels/{}",
         base_path,
         team_id.simple(),
         channel_id.simple()

src/cli.rs

@@ -1,15 +1,11 @@
 use anyhow::Result;
-use axum::{
+use axum::middleware::map_request;
-    http::{header::CONTENT_SECURITY_POLICY, HeaderValue},
-    middleware::map_request,
-};
 use chrono::{TimeDelta, Utc};
 use clap::{Parser, Subcommand};
 use tokio::time::sleep;
 use tower::ServiceBuilder;
 use tower_http::{
-    compression::CompressionLayer, normalize_path::NormalizePathLayer,
+    compression::CompressionLayer, normalize_path::NormalizePathLayer, trace::TraceLayer,
-    set_header::response::SetResponseHeaderLayer, trace::TraceLayer,
 };
 
 use crate::{
@@ -46,11 +42,7 @@ pub async fn serve_command(state: AppState) -> Result<()> {
             .layer(map_request(lowercase_uri_path))
             .layer(TraceLayer::new_for_http())
             .layer(CompressionLayer::new())
-            .layer(NormalizePathLayer::trim_trailing_slash())
+            .layer(NormalizePathLayer::trim_trailing_slash()),
-            .layer(SetResponseHeaderLayer::if_not_present(
-                CONTENT_SECURITY_POLICY,
-                HeaderValue::from_static("frame-ancestors 'none'"),
-            )),
     );
 
     let listener =

src/main.rs

@@ -1,12 +1,12 @@
 use clap::Parser as _;
 use diesel_migrations::MigrationHarness;
 use dotenvy::dotenv;
+use migrations::MIGRATIONS;
 use tracing_subscriber::EnvFilter;
 
 use crate::{
     app_state::{App, AppState},
     cli::{serve_command, worker_command, Cli, Commands},
-    migrations::MIGRATIONS,
     settings::Settings,
 };
 

src/nav_state.rs

@@ -34,11 +34,11 @@ impl NavState {
         self.team_id = Some(team.id);
         self.navbar_active_item = "teams".to_string();
         self.breadcrumbs.push(Breadcrumb {
-            href: format!("{}/en/teams", self.base_path),
+            href: format!("{}/teams", self.base_path),
             label: "Teams".to_string(),
         });
         self.breadcrumbs.push(Breadcrumb {
-            href: format!("{}/en/teams/{}", self.base_path, team.id.simple()),
+            href: format!("{}/teams/{}", self.base_path, team.id.simple()),
             label: team.name.clone(),
         });
         self
@@ -50,12 +50,12 @@ impl NavState {
         ))?;
         self.navbar_active_item = "projects".to_string();
         self.breadcrumbs.push(Breadcrumb {
-            href: format!("{}/en/teams/{}/projects", self.base_path, team_id),
+            href: format!("{}/teams/{}/projects", self.base_path, team_id),
             label: "Projects".to_string(),
         });
         self.breadcrumbs.push(Breadcrumb {
             href: format!(
-                "{}/en/teams/{}/projects/{}",
+                "{}/teams/{}/projects/{}",
                 self.base_path,
                 team_id,
                 project.id.simple()

src/projects_router.rs

@@ -230,7 +230,7 @@ async fn update_enabled_channels(
         .unwrap()?;
 
     Ok(Redirect::to(&format!(
-        "{}/en/teams/{}/projects/{}",
+        "{}/teams/{}/projects/{}",
         base_path, team_id, project_id
     ))
     .into_response())

src/router.rs

@@ -1,15 +1,10 @@
 use axum::{
     extract::State,
-    http::{header::CACHE_CONTROL, HeaderValue},
     response::{IntoResponse, Redirect},
     routing::get,
     Router,
 };
-use tower::ServiceBuilder;
+use tower_http::services::{ServeDir, ServeFile};
-use tower_http::{
-    services::{ServeDir, ServeFile},
-    set_header::SetResponseHeaderLayer,
-};
 
 use crate::{
     app_state::AppState, auth, channels_router, projects_router, settings::Settings, teams_router,
@@ -18,36 +13,15 @@ use crate::{
 
 pub fn new_router(state: AppState) -> Router<()> {
     let base_path = state.settings.base_path.clone();
-    let ui_router = Router::new()
+    let app = Router::new()
         .route("/", get(landing_page))
         .merge(channels_router::new_router())
         .merge(projects_router::new_router())
-        .merge(teams_router::new_router());
+        .merge(teams_router::new_router())
-    let app = Router::new()
-        .route("/", get(landing_page))
         .merge(v0_router::new_router())
-        .nest("/en", ui_router)
         .nest("/auth", auth::new_router())
-        .layer(SetResponseHeaderLayer::if_not_present(
-            CACHE_CONTROL,
-            HeaderValue::from_static("no-cache"),
-        ))
         .fallback_service(
-            ServiceBuilder::new()
+            ServeDir::new("static").not_found_service(ServeFile::new("static/_404.html")),
-                .layer(SetResponseHeaderLayer::if_not_present(
-                    CACHE_CONTROL,
-                    HeaderValue::from_static("max-age=21600, stale-while-revalidate=86400"),
-                ))
-                .service(
-                    ServeDir::new("static").not_found_service(
-                        ServiceBuilder::new()
-                            .layer(SetResponseHeaderLayer::if_not_present(
-                                CACHE_CONTROL,
-                                HeaderValue::from_static("no-cache"),
-                            ))
-                            .service(ServeFile::new("static/_404.html")),
-                    ),
-                ),
         )
         .with_state(state);
     if base_path.is_empty() {
@@ -60,5 +34,5 @@ pub fn new_router(state: AppState) -> Router<()> {
 }
 
 async fn landing_page(State(Settings { base_path, .. }): State<Settings>) -> impl IntoResponse {
-    Redirect::to(&format!("{}/en/teams", base_path))
+    Redirect::to(&format!("{}/teams", base_path))
 }

src/settings.rs

@@ -108,11 +108,8 @@ impl Settings {
     }
 }
 
-impl<S> FromRef<S> for Settings
+impl FromRef<AppState> for Settings {
-where
+    fn from_ref(state: &AppState) -> Self {
-    S: Into<AppState> + Clone,
+        state.settings.clone()
-{
-    fn from_ref(state: &S) -> Self {
-        Into::<AppState>::into(state.clone()).settings.clone()
     }
 }

src/teams_router.rs

@@ -51,7 +51,7 @@ async fn teams_page(
     let nav_state = NavState::new()
         .set_base_path(&base_path)
         .push_slug(Breadcrumb {
-            href: "en/teams".to_string(),
+            href: "teams".to_string(),
             label: "Teams".to_string(),
         })
         .set_navbar_active_item("teams");
@@ -76,7 +76,7 @@ async fn team_page(
     State(Settings { base_path, .. }): State<Settings>,
     Path(team_id): Path<Uuid>,
 ) -> impl IntoResponse {
-    Redirect::to(&format!("{}/en/teams/{}/projects", base_path, team_id))
+    Redirect::to(&format!("{}/teams/{}/projects", base_path, team_id))
 }
 
 #[derive(Deserialize)]
@@ -96,7 +96,7 @@ async fn post_new_api_key(
 
     ApiKey::generate_for_team(&db_conn, team.id).await?;
     Ok(Redirect::to(&format!(
-        "{}/en/teams/{}/projects",
+        "{}/teams/{}/projects",
         base_path,
         team.id.hyphenated()
     ))
@@ -113,7 +113,7 @@ async fn new_team_page(
     let nav_state = NavState::new()
         .set_base_path(&base_path)
         .push_slug(Breadcrumb {
-            href: "en/new-team".to_string(),
+            href: "new-team".to_string(),
             label: "New Team".to_string(),
         })
         .set_navbar_active_item("teams");

src/users.rs

@@ -53,16 +53,15 @@ impl User {
 #[derive(Clone, Debug)]
 pub struct CurrentUser(pub User);
 
-impl<S> FromRequestParts<S> for CurrentUser
+impl FromRequestParts<AppState> for CurrentUser {
-where
-    S: Into<AppState> + Clone + Sync,
-{
     type Rejection = AppError;
 
-    async fn from_request_parts(parts: &mut Parts, state: &S) -> Result<Self, Self::Rejection> {
+    async fn from_request_parts(
-        let state: AppState = state.clone().into();
+        parts: &mut Parts,
+        state: &AppState,
+    ) -> Result<Self, <Self as FromRequestParts<AppState>>::Rejection> {
         let auth_info = parts
-            .extract_with_state::<AuthInfo, AppState>(&state)
+            .extract_with_state::<AuthInfo, AppState>(state)
             .await
             .map_err(|_| {
                 AppError::auth_redirect_from_base_path(state.settings.base_path.clone())

templates/channel-email.html

@@ -12,7 +12,7 @@
     <section class="mb-4">
       <form
         method="post"
-        action="{{ base_path }}/en/teams/{{ nav_state.team_id.unwrap().simple() }}/channels/{{ channel.id.simple() }}/update-channel"
+        action="{{ base_path }}/teams/{{ nav_state.team_id.unwrap().simple() }}/channels/{{ channel.id.simple() }}/update-channel"
       >
         <div class="mb-3">
           <label for="channel-name-input" class="form-label">Channel Name</label>
@@ -51,7 +51,7 @@
     <section class="mb-4">
       <form
         method="post"
-        action="{{ base_path }}/en/teams/{{ nav_state.team_id.unwrap().simple() }}/channels/{{ channel.id.simple() }}/update-email-recipient"
+        action="{{ base_path }}/teams/{{ nav_state.team_id.unwrap().simple() }}/channels/{{ channel.id.simple() }}/update-email-recipient"
       >
         <div class="mb-3">
           <label for="channel-recipient-input" class="form-label">Recipient Email</label>
@@ -81,7 +81,7 @@
       <section class="mb-4">
         <form
           method="post"
-          action="{{ base_path }}/en/teams/{{ nav_state.team_id.unwrap().simple() }}/channels/{{ channel.id.simple() }}/verify-email"
+          action="{{ base_path }}/teams/{{ nav_state.team_id.unwrap().simple() }}/channels/{{ channel.id.simple() }}/verify-email"
         >
           <div class="mb-3">
             <label for="channel-recipient-verification-code" class="form-label">
@@ -114,7 +114,7 @@
         <form
           id="email-verification-form"
           method="post"
-          action="{{ base_path }}/en/teams/{{ nav_state.team_id.unwrap().simple() }}/channels/{{ channel.id.simple() }}/update-email-recipient"
+          action="{{ base_path }}/teams/{{ nav_state.team_id.unwrap().simple() }}/channels/{{ channel.id.simple() }}/update-email-recipient"
         >
           <input type="hidden" name="recipient" value="{{ email_data.recipient }}">
           <input type="hidden" name="csrf_token" value="{{ csrf_token }}">

templates/channels.html

@@ -24,7 +24,7 @@
             <li>
                 <form
                   method="post"
-                  action="{{ base_path }}/en/teams/{{ nav_state.team_id.unwrap().simple() }}/new-channel"
+                  action="{{ base_path }}/teams/{{ nav_state.team_id.unwrap().simple() }}/new-channel"
                 >
                 <input type="hidden" name="csrf_token" value="{{ csrf_token }}">
                 <input type="hidden" name="channel_type" value="email">
@@ -41,7 +41,7 @@
     Channels are places to send messages, alerts, and so on. Once created, they
     can be connected to specific projects at the
     <a
-      href="{{ base_path }}/en/teams/{{ nav_state.team_id.unwrap().simple() }}/projects"
+      href="{{ base_path }}/teams/{{ nav_state.team_id.unwrap().simple() }}/projects"
     >Projects page</a>.
   </div>
   <section class="mb-3">
@@ -50,7 +50,7 @@
         {% for channel in channels %}
           <tr>
             <td>
-              <a href="{{ base_path }}/en/teams/{{ nav_state.team_id.unwrap().simple() }}/channels/{{ channel.id.simple() }}">
+              <a href="{{ base_path }}/teams/{{ nav_state.team_id.unwrap().simple() }}/channels/{{ channel.id.simple() }}">
                 {{ channel.name }}
               </a>
             </td>

templates/nav.html

@@ -18,7 +18,7 @@
           <a
             class="nav-link{% if nav_state.navbar_active_item == "teams" %} active{% endif %}"
             {% if nav_state.navbar_active_item == "teams" %}aria-current="page"{% endif %}
-            href="{{ base_path }}/en/teams"
+            href="{{ base_path }}/teams"
           >
             Teams
           </a>
@@ -28,7 +28,7 @@
             <a
               class="nav-link{% if nav_state.navbar_active_item == "projects" %} active{% endif %}"
               {% if nav_state.navbar_active_item == "projects" %}aria-current="page"{% endif %}
-              href="{{ base_path }}/en/teams/{{ team_id.simple() }}/projects"
+              href="{{ base_path }}/teams/{{ team_id.simple() }}/projects"
             >
               Projects
             </a>
@@ -37,7 +37,7 @@
             <a
               class="nav-link{% if nav_state.navbar_active_item == "channels" %} active{% endif %}"
               {% if nav_state.navbar_active_item == "channels" %}aria-current="page"{% endif %}
-              href="{{ base_path }}/en/teams/{{ team_id.simple() }}/channels"
+              href="{{ base_path }}/teams/{{ team_id.simple() }}/channels"
             >
               Channels
             </a>

templates/new-team.html

@@ -1,7 +1,12 @@
 {% extends "base.html" %}
 
 {% block main %}
-{% include "breadcrumbs.html" %}
+<nav class="container mt-4" aria-label="breadcrumb">
+  <ol class="breadcrumb">
+    <li class="breadcrumb-item"><a href="{{ base_path }}/teams">Teams</a></li>
+    <li class="breadcrumb-item active" aria-current="page">New Team</li>
+  </ol>
+</nav>
 <main class="mt-5">
   <section class="container mb-3">
     <h1 class="mt-5">New Team</h1>
@@ -14,7 +19,7 @@
       </div>
       <div class="mb-3">
         <button class="btn btn-primary" type="submit">Submit</button>
-        <a class="btn btn-secondary" role="button" href="{{ base_path }}/en/teams">
+        <a class="btn btn-secondary" role="button" href="{{ base_path }}/teams">
           Cancel
         </a>
       </div>

templates/project.html

@@ -12,7 +12,7 @@
     <h2>Enabled Channels</h2>
     <form
       method="post"
-      action="{{ base_path }}/en/teams/{{ nav_state.team_id.unwrap().simple() }}/projects/{{ project.id.simple() }}/update-enabled-channels"
+      action="{{ base_path }}/teams/{{ nav_state.team_id.unwrap().simple() }}/projects/{{ project.id.simple() }}/update-enabled-channels"
     >
       <div class="mb-3">
         <table class="table">
@@ -29,7 +29,7 @@
                   <label for="enable-channel-switch-{{ channel.id.simple() }}">
                     <a
                       target="_blank"
-                      href="{{ base_path }}/en/teams/{{ nav_state.team_id.unwrap().simple() }}/channels/{{ channel.id.simple() }}"
+                      href="{{ base_path }}/teams/{{ nav_state.team_id.unwrap().simple() }}/channels/{{ channel.id.simple() }}"
                     >
                       {{ channel.name }}
                     </a>

templates/projects.html

@@ -38,7 +38,7 @@
               {% for project in projects %}
                 <tr>
                   <td>
-                    <a href="{{ base_path }}/en/teams/{{ nav_state.team_id.unwrap().simple() }}/projects/{{ project.id.simple() }}">
+                    <a href="{{ base_path }}/teams/{{ nav_state.team_id.unwrap().simple() }}/projects/{{ project.id.simple() }}">
                       {{ project.name }}
                     </a>
                   </td>
@@ -53,7 +53,7 @@
           <h1 class="mb-4">API Keys</h1>
         </section>
         <section class="mb-3">
-          <form method="post" action="{{ base_path }}/en/teams/{{ nav_state.team_id.unwrap().simple() }}/new-api-key">
+          <form method="post" action="{{ base_path }}/teams/{{ nav_state.team_id.unwrap().simple() }}/new-api-key">
             <input type="hidden" name="csrf_token" value="{{ csrf_token }}">
             <button class="btn btn-primary" type="submit">Generate Key</button>
           </form>

templates/teams.html

@@ -9,7 +9,7 @@
     <div class="d-flex justify-content-between align-items-center">
       <h1>Teams</h1>
       <div>
-        <a href="{{ base_path }}/en/new-team" role="button" class="btn btn-primary">New Team</a>
+        <a href="{{ base_path }}/new-team" role="button" class="btn btn-primary">New Team</a>
       </div>
     </div>
   </section>
@@ -24,7 +24,7 @@
         {% for team in teams %}
           <tr>
             <td>
-              <a href="{{ base_path }}/en/teams/{{ team.id }}">
+              <a href="{{ base_path }}/teams/{{ team.id }}">
                 {{ team.name }}
               </a>
             </td>