style and typo fixes

src/api/lib.zig

@@ -5,6 +5,8 @@ const sql = @import("sql");
 const DateTime = util.DateTime;
 const Uuid = util.Uuid;
 
+const default_avatar = "static/default_avi.png";
+
 const services = struct {
     const communities = @import("./services/communities.zig");
     const actors = @import("./services/actors.zig");
@@ -52,7 +54,10 @@ pub const UserResponse = struct {
     bio: []const u8,
 
     avatar_file_id: ?Uuid,
+    avatar_url: []const u8,
+
     header_file_id: ?Uuid,
+    header_url: ?[]const u8,
 
     profile_fields: []const ProfileField,
 
@@ -459,6 +464,28 @@ fn ApiConn(comptime DbConn: type) type {
         fn getUserUnchecked(self: *Self, db: anytype, user_id: Uuid) !UserResponse {
             const user = try services.actors.get(db, user_id, self.allocator);
 
+            const avatar_url = if (user.avatar_file_id) |fid|
+                try std.fmt.allocPrint(
+                    self.allocator,
+                    "{s}://{s}/media/{}",
+                    .{ @tagName(self.community.scheme), self.community.host, fid },
+                )
+            else
+                try std.fmt.allocPrint(
+                    self.allocator,
+                    "{s}://{s}/{s}",
+                    .{ @tagName(self.community.scheme), self.community.host, default_avatar },
+                );
+            errdefer self.allocator.free(avatar_url);
+            const header_url = if (user.header_file_id) |fid|
+                try std.fmt.allocPrint(
+                    self.allocator,
+                    "{s}://{s}/media/{}",
+                    .{ @tagName(self.community.scheme), self.community.host, fid },
+                )
+            else
+                null;
+
             return UserResponse{
                 .id = user.id,
 
@@ -469,7 +496,10 @@ fn ApiConn(comptime DbConn: type) type {
                 .bio = user.bio,
 
                 .avatar_file_id = user.avatar_file_id,
+                .avatar_url = avatar_url,
+
                 .header_file_id = user.header_file_id,
+                .header_url = header_url,
 
                 .profile_fields = user.profile_fields,
 

src/main/controllers/web/signup.tmpl.html

@@ -10,17 +10,20 @@
   <div>
     <div>You are about to accept an invite from:</div>
     <div class="user-mini">
-      <div>
+      <img class="avatar" src="{$invite.creator.avatar_url}" />
-      {=#if $invite.creator.display_name |$name|=}
+      <div class="details">
-        {$name}
+        <div class="display_name">
-      {= #else =}
+        {=#if $invite.creator.display_name |$name|=}
-        {$invite.creator.username}
+          {$name}
-      {= /if =}
+        {= #else =}
+          {$invite.creator.username}
+        {= /if =}
+        </div>
+        <div class="handle">@{$invite.creator.username}@{$invite.creator.host}</div>
       </div>
-      <div>@{$invite.creator.username}@{$invite.creator.host}</div>
     </div>
     {#if @isTag($invite.kind, community_owner) =}
-      <div>This act will make your new account the owner of { %community.name }</div>
+      <div>This act will make your new account the owner of { %community.name }.</div>
     {/if =}
   </div>
   {=/if}
@@ -44,7 +47,7 @@
     <div>Email</div>
     <div class="textinput">
       <span class="prefix"><i class="fa-solid fa-envelope fa-fw"></i></span>
-      <input type="email" name="email" placeholder="me@exmaple.com" />
+      <input type="email" name="email" placeholder="me@example.com" />
     </div>
   </label>
   {#if .invite |$invite| =}

src/template/lib.zig

@@ -7,7 +7,7 @@ pub fn main() !void {
         .{ .test_tmpl = "{.x} {%context_foo}" },
         @embedFile("./test.tmp.html"),
         .{
-            .community = .{ .name = "abcd" },
+            .community = .{ .name = "<abcd>" },
             .foo = [_][]const u8{ "5", "4", "3", "2", "1" },
             .baz = [_][]const []const u8{
                 &.{ "5", "4", "3", "2", "1" },
@@ -184,9 +184,19 @@ fn executeStatement(
     }
 }
 
+fn htmlEscape(writer: anytype, str: []const u8) !void {
+    for (str) |ch| switch (ch) {
+        '<' => try writer.writeAll("&lt;"),
+        '>' => try writer.writeAll("&gt;"),
+        '"' => try writer.writeAll("&quot;"),
+        '&' => try writer.writeAll("&amp;"),
+        else => try writer.writeByte(ch),
+    };
+}
+
 fn print(writer: anytype, arg: anytype) !void {
     const T = @TypeOf(arg);
-    if (comptime std.meta.trait.isZigString(T)) return writer.writeAll(arg);
+    if (comptime std.meta.trait.isZigString(T)) return htmlEscape(writer, arg);
     if (comptime std.meta.trait.isNumber(T)) return std.fmt.format(writer, "{}", .{arg});
     @compileLog(@TypeOf(arg));
 

static/default_avi.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:54247347d90cecd9e6d598e1d74fae31f874ebb5c5e4dff7b4acc6a606acceef
+size 40812

static/site.css

@@ -43,56 +43,79 @@ nav > ul > li.title > a {
 
 main {
   padding: 1em;
+  overflow: scroll;
+}
+
+.user-mini {
+  display: flex;
+  margin: 0.5em 0px;
+}
+
+.user-mini .avatar {
+  max-width: 3em;
+}
+.user-mini .details {
+  margin: 5px;
+}
+
+.user-mini .handle {
+  font-size: small;
 }
 
 form {
   display: flex;
   flex-direction: column;
   max-width: 400px;
-}
-.textinput {
-  display: inline-block;
-  padding: 6px;
-  border: solid 1px black;
-  border-radius: 8px;
-/*  max-width: 300px;*/
-}
-
-form {
   padding: 1em;
 }
-
 form > * {
   margin: 5px 0px;
 }
-
+form .textinput {
-form[action*=login] .textinput {
   display: flex;
 
+  padding: 6px;
+  border: solid 1px black;
+  border-radius: 8px;
   outline: solid 2px transparent;
   transition: outline 0.2s;
+  cursor: text;
 }
-form[action*=login] .textinput input {
+form .textinput input {
   flex-grow: 1;
+  flex-basis: 3em;
+  width: 10px;
+  appearance: none;
+  border: none;
 }
-form[action*=login] .textinput:focus-within {
+form .textinput input:focus-visible{
+  outline: none;
+}
+form .textinput:focus-within {
   outline: solid 2px var(--theme-color);
 }
-form[action*=login] .textinput span.prefix,
+form .textinput span.prefix {
-form[action*=login] .textinput span.suffix {
   user-select: none;
   flex-basis: 1.5em;
   text-align: center;
 }
-.textinput > input {
+form .textinput span.suffix {
-  appearance: none;
+  user-select: none;
-  border: none;
+  flex-basis: 3em;
-}
+  flex-grow: 1;
-.textinput > input:focus-visible{
+  max-width: min-content;
-  outline: none;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
 }
 
-.form-helpinfo {
+@media (max-width: 360px) {
+  form .textinput span.suffix {
+    display: none;
+  }
+}
+
+form .form-helpinfo {
   font-size: small;
 }
 
@@ -103,9 +126,11 @@ button, a.button {
   color: #fff;
   background-color: var(--theme-color);
   font-weight: bold;
+  transition: background-color 0.2s;
+  cursor: pointer;
 }
 
 button:hover, a.button:hover {
-  cursor: pointer;
   background-color: var(--theme-color-highlight);
 }
+