Get loaded data using `export let data`, instead of fishing around in $page.

This is mostly a how-to-Svelte thing.

I've also made the API responses for invites a bit more caller-friendly by flattening them and adding the ID field into them. The ID is redundant (the client knows it because the client has the invitation URL), but it makes presenting invitations and actioning them a bit easier.

2 files changed, 6 insertions, 9 deletions

diff --git a/src/invite/mod.rs b/src/invite/mod.rs
index 5f9d490..abf1c3a 100644
--- a/src/invite/mod.rs
+++ b/src/invite/mod.rs
@@ -3,10 +3,7 @@ mod id;
 mod repo;
 mod routes;
 
-use crate::{
-    clock::DateTime,
-    login::{self, Login},
-};
+use crate::{clock::DateTime, login};
 
 pub use self::{id::Id, routes::router};
 
@@ -19,6 +16,7 @@ pub struct Invite {
 
 #[derive(serde::Serialize)]
 pub struct Summary {
-    pub issuer: Login,
+    pub id: Id,
+    pub issuer: String,
     pub issued_at: DateTime,
 }
diff --git a/src/invite/repo.rs b/src/invite/repo.rs
index 2ab993f..643f5b7 100644
--- a/src/invite/repo.rs
+++ b/src/invite/repo.rs
@@ -68,6 +68,7 @@ impl<'c> Invites<'c> {
         let invite = sqlx::query!(
             r#"
 				select
+                    invite.id as "invite_id: Id",
 					issuer.id as "issuer_id: login::Id",
 					issuer.name as "issuer_name",
 					invite.issued_at as "invite_issued_at: DateTime"
@@ -78,10 +79,8 @@ impl<'c> Invites<'c> {
             invite,
         )
         .map(|row| Summary {
-            issuer: Login {
-                id: row.issuer_id,
-                name: row.issuer_name,
-            },
+            id: row.invite_id,
+            issuer: row.issuer_name,
             issued_at: row.invite_issued_at,
         })
         .fetch_one(&mut *self.0)