diff options
| author | Frank <[email protected]> | 2025-10-02 17:55:54 -0400 |
|---|---|---|
| committer | Frank <[email protected]> | 2025-10-02 17:55:54 -0400 |
| commit | a8341e2b8be40f93aa4dddf5349a420a03966fcf (patch) | |
| tree | 954f074a87949ea6684a65d4210e43d162721f22 /packages/console/app | |
| parent | 73115efab13840612bc3e6d218679e1bdf6ae3c0 (diff) | |
| download | opencode-a8341e2b8be40f93aa4dddf5349a420a03966fcf.tar.gz opencode-a8341e2b8be40f93aa4dddf5349a420a03966fcf.zip | |
wip: zen
Diffstat (limited to 'packages/console/app')
| -rw-r--r-- | packages/console/app/src/context/auth.ts | 22 | ||||
| -rw-r--r-- | packages/console/app/src/entry-server.tsx | 2 | ||||
| -rw-r--r-- | packages/console/app/src/routes/index.tsx | 2 | ||||
| -rw-r--r-- | packages/console/app/src/routes/workspace.tsx | 2 | ||||
| -rw-r--r-- | packages/console/app/src/routes/workspace/member-section.tsx | 4 |
5 files changed, 13 insertions, 19 deletions
diff --git a/packages/console/app/src/context/auth.ts b/packages/console/app/src/context/auth.ts index 079f05c9c..eff005c53 100644 --- a/packages/console/app/src/context/auth.ts +++ b/packages/console/app/src/context/auth.ts @@ -1,9 +1,7 @@ import { getRequestEvent } from "solid-js/web" import { and, Database, eq, inArray, sql } from "@opencode/console-core/drizzle/index.js" -import { WorkspaceTable } from "@opencode/console-core/schema/workspace.sql.js" import { UserTable } from "@opencode/console-core/schema/user.sql.js" import { redirect } from "@solidjs/router" -import { AccountTable } from "@opencode/console-core/schema/account.sql.js" import { Actor } from "@opencode/console-core/actor.js" import { createClient } from "@openauthjs/openauth/client" @@ -54,31 +52,27 @@ export const getActor = async (workspace?: string): Promise<Actor.Info> => { } const accounts = Object.keys(auth.data.account ?? {}) if (accounts.length) { - const result = await Database.use((tx) => + const user = await Database.use((tx) => tx - .select({ - user: UserTable, - }) - .from(AccountTable) - .innerJoin(UserTable, and(eq(UserTable.email, AccountTable.email))) - .innerJoin(WorkspaceTable, eq(WorkspaceTable.id, UserTable.workspaceID)) - .where(and(inArray(AccountTable.id, accounts), eq(WorkspaceTable.id, workspace))) + .select() + .from(UserTable) + .where(and(eq(UserTable.workspaceID, workspace), inArray(UserTable.accountID, accounts))) .limit(1) .execute() .then((x) => x[0]), ) - if (result) { + if (user) { await Database.use((tx) => tx .update(UserTable) .set({ timeSeen: sql`now()` }) - .where(eq(UserTable.id, result.user.id)), + .where(and(eq(UserTable.workspaceID, workspace), eq(UserTable.id, user.id))), ) return { type: "user", properties: { - userID: result.user.id, - workspaceID: result.user.workspaceID, + userID: user.id, + workspaceID: user.workspaceID, }, } } diff --git a/packages/console/app/src/entry-server.tsx b/packages/console/app/src/entry-server.tsx index d5fca6aa5..e05133147 100644 --- a/packages/console/app/src/entry-server.tsx +++ b/packages/console/app/src/entry-server.tsx @@ -9,7 +9,7 @@ export default createHandler( <head> <meta charset="utf-8" /> <meta name="viewport" content="width=device-width, initial-scale=1" /> - <link rel="icon" href="/favicon.svg" /> + <link rel="icon" href="/favicon-zen.svg" /> <meta property="og:image" content="/social-share.png" /> <meta property="twitter:image" content="/social-share.png" /> {assets} diff --git a/packages/console/app/src/routes/index.tsx b/packages/console/app/src/routes/index.tsx index 95a24268b..281cec099 100644 --- a/packages/console/app/src/routes/index.tsx +++ b/packages/console/app/src/routes/index.tsx @@ -56,7 +56,7 @@ export default function Home() { <main data-page="opencode"> <HttpHeader name="Cache-Control" value="public, max-age=1, s-maxage=3600, stale-while-revalidate=86400" /> <Title>OpenCode | The AI coding agent built for the terminal</Title> - <Link rel="icon" type="image/svg+xml" href="/favicon.svg" /> + <Link rel="icon" type="image/svg+xml" href="/favicon-zen.svg" /> <Meta property="og:image" content="/social-share.png" /> <Meta name="twitter:image" content="/social-share.png" /> <div data-component="container"> diff --git a/packages/console/app/src/routes/workspace.tsx b/packages/console/app/src/routes/workspace.tsx index 3aa3f20d3..9a90fb9a9 100644 --- a/packages/console/app/src/routes/workspace.tsx +++ b/packages/console/app/src/routes/workspace.tsx @@ -38,7 +38,7 @@ const logout = action(async () => { event!.locals.actor = undefined return val }) - throw redirect("/") + throw redirect("/zen") }) export default function WorkspaceLayout(props: RouteSectionProps) { diff --git a/packages/console/app/src/routes/workspace/member-section.tsx b/packages/console/app/src/routes/workspace/member-section.tsx index 7dc893346..4bd45a153 100644 --- a/packages/console/app/src/routes/workspace/member-section.tsx +++ b/packages/console/app/src/routes/workspace/member-section.tsx @@ -169,7 +169,7 @@ function MemberRow(props: { member: any; workspaceID: string; currentUserID: str when={editing()} fallback={ <tr> - <td data-slot="member-email">{props.member.email}</td> + <td data-slot="member-email">{props.member.accountEmail ?? props.member.email}</td> <td data-slot="member-role">{props.member.role}</td> <Show when={!props.member.timeSeen} fallback={<td data-slot="member-joined"></td>}> <td data-slot="member-joined">invited</td> @@ -192,7 +192,7 @@ function MemberRow(props: { member: any; workspaceID: string; currentUserID: str <tr> <td colspan="4"> <form action={updateMemberRole} method="post"> - <div data-slot="edit-member-email">{props.member.email}</div> + <div data-slot="edit-member-email">{props.member.accountEmail ?? props.member.email}</div> <input type="hidden" name="id" value={props.member.id} /> <input type="hidden" name="workspaceID" value={props.workspaceID} /> <Show when={!isCurrentUser()} fallback={<div data-slot="current-user-role">Role: {props.member.role}</div>}> |