Skip to content

Commit 51ff0c1

Browse files
u
1 parent d2e3ae5 commit 51ff0c1

11 files changed

Lines changed: 132 additions & 46 deletions

File tree

‎drizzle/0000_init.sql‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ CREATE TABLE "contacts" (
127127
"avatar_url" text,
128128
"tags" text[] DEFAULT '{}'::text[] NOT NULL,
129129
"custom_fields" jsonb DEFAULT '{}'::jsonb NOT NULL,
130+
"alternate_emails" text[] DEFAULT '{}'::text[] NOT NULL,
130131
"last_contacted_at" timestamp with time zone,
131132
"message_count" integer DEFAULT 0 NOT NULL,
132133
"created_at" timestamp with time zone DEFAULT now() NOT NULL,
@@ -601,7 +602,9 @@ CREATE INDEX "audit_logs_created_idx" ON "audit_logs" USING btree ("created_at")
601602
CREATE INDEX "canned_responses_org_idx" ON "canned_responses" USING btree ("org_id");--> statement-breakpoint
602603
CREATE INDEX "comments_conversation_idx" ON "comments" USING btree ("conversation_id","created_at");--> statement-breakpoint
603604
CREATE INDEX "contacts_org_idx" ON "contacts" USING btree ("org_id");--> statement-breakpoint
604-
CREATE UNIQUE INDEX "contacts_org_email_idx" ON "contacts" USING btree ("org_id",lower("email"));--> statement-breakpoint
605+
CREATE UNIQUE INDEX "contacts_org_email_idx" ON "contacts" USING btree ("org_id",lower("email")) WHERE "contacts"."owner_user_id" is null;--> statement-breakpoint
606+
CREATE UNIQUE INDEX "contacts_owner_email_idx" ON "contacts" USING btree ("org_id","owner_user_id",lower("email")) WHERE "contacts"."owner_user_id" is not null;--> statement-breakpoint
607+
CREATE INDEX "contacts_alternate_emails_idx" ON "contacts" USING gin ("alternate_emails");--> statement-breakpoint
605608
CREATE INDEX "conv_assignees_user_idx" ON "conversation_assignees" USING btree ("user_id");--> statement-breakpoint
606609
CREATE INDEX "conversation_events_conv_idx" ON "conversation_events" USING btree ("conversation_id","created_at");--> statement-breakpoint
607610
CREATE INDEX "conv_labels_label_idx" ON "conversation_labels" USING btree ("label_id");--> statement-breakpoint
@@ -624,8 +627,10 @@ CREATE INDEX "memberships_user_idx" ON "memberships" USING btree ("user_id");-->
624627
CREATE INDEX "messages_conversation_idx" ON "messages" USING btree ("conversation_id","created_at");--> statement-breakpoint
625628
CREATE INDEX "messages_org_msgid_idx" ON "messages" USING btree ("org_id","message_id");--> statement-breakpoint
626629
CREATE UNIQUE INDEX "messages_account_msgid_idx" ON "messages" USING btree ("account_id","message_id");--> statement-breakpoint
630+
CREATE INDEX "messages_account_reply_idx" ON "messages" USING btree ("account_id","in_reply_to");--> statement-breakpoint
627631
CREATE INDEX "messages_status_send_idx" ON "messages" USING btree ("status","send_at");--> statement-breakpoint
628632
CREATE INDEX "messages_author_idx" ON "messages" USING btree ("author_id");--> statement-breakpoint
633+
CREATE INDEX "messages_search_idx" ON "messages" USING gin (to_tsvector('simple', coalesce("subject", '') || ' ' || coalesce("text_body", '')));--> statement-breakpoint
629634
CREATE INDEX "notifications_user_idx" ON "notifications" USING btree ("user_id","created_at");--> statement-breakpoint
630635
CREATE UNIQUE INDEX "organizations_slug_idx" ON "organizations" USING btree ("slug");--> statement-breakpoint
631636
CREATE INDEX "roles_org_idx" ON "roles" USING btree ("org_id");--> statement-breakpoint

‎drizzle/meta/0000_snapshot.json‎

Lines changed: 88 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"id": "58a2de31-22fc-45ec-bce1-d2a688e1e3ec",
2+
"id": "e8e4e8f4-bf63-4ce3-9218-3fd54ca069e1",
33
"prevId": "00000000-0000-0000-0000-000000000000",
44
"version": "7",
55
"dialect": "postgresql",
@@ -1117,6 +1117,13 @@
11171117
"notNull": true,
11181118
"default": "'{}'::jsonb"
11191119
},
1120+
"alternate_emails": {
1121+
"name": "alternate_emails",
1122+
"type": "text[]",
1123+
"primaryKey": false,
1124+
"notNull": true,
1125+
"default": "'{}'::text[]"
1126+
},
11201127
"last_contacted_at": {
11211128
"name": "last_contacted_at",
11221129
"type": "timestamp with time zone",
@@ -1178,9 +1185,53 @@
11781185
}
11791186
],
11801187
"isUnique": true,
1188+
"where": "\"contacts\".\"owner_user_id\" is null",
1189+
"concurrently": false,
1190+
"method": "btree",
1191+
"with": {}
1192+
},
1193+
"contacts_owner_email_idx": {
1194+
"name": "contacts_owner_email_idx",
1195+
"columns": [
1196+
{
1197+
"expression": "org_id",
1198+
"isExpression": false,
1199+
"asc": true,
1200+
"nulls": "last"
1201+
},
1202+
{
1203+
"expression": "owner_user_id",
1204+
"isExpression": false,
1205+
"asc": true,
1206+
"nulls": "last"
1207+
},
1208+
{
1209+
"expression": "lower(\"email\")",
1210+
"asc": true,
1211+
"isExpression": true,
1212+
"nulls": "last"
1213+
}
1214+
],
1215+
"isUnique": true,
1216+
"where": "\"contacts\".\"owner_user_id\" is not null",
11811217
"concurrently": false,
11821218
"method": "btree",
11831219
"with": {}
1220+
},
1221+
"contacts_alternate_emails_idx": {
1222+
"name": "contacts_alternate_emails_idx",
1223+
"columns": [
1224+
{
1225+
"expression": "alternate_emails",
1226+
"isExpression": false,
1227+
"asc": true,
1228+
"nulls": "last"
1229+
}
1230+
],
1231+
"isUnique": false,
1232+
"concurrently": false,
1233+
"method": "gin",
1234+
"with": {}
11841235
}
11851236
},
11861237
"foreignKeys": {
@@ -3094,6 +3145,27 @@
30943145
"method": "btree",
30953146
"with": {}
30963147
},
3148+
"messages_account_reply_idx": {
3149+
"name": "messages_account_reply_idx",
3150+
"columns": [
3151+
{
3152+
"expression": "account_id",
3153+
"isExpression": false,
3154+
"asc": true,
3155+
"nulls": "last"
3156+
},
3157+
{
3158+
"expression": "in_reply_to",
3159+
"isExpression": false,
3160+
"asc": true,
3161+
"nulls": "last"
3162+
}
3163+
],
3164+
"isUnique": false,
3165+
"concurrently": false,
3166+
"method": "btree",
3167+
"with": {}
3168+
},
30973169
"messages_status_send_idx": {
30983170
"name": "messages_status_send_idx",
30993171
"columns": [
@@ -3129,6 +3201,21 @@
31293201
"concurrently": false,
31303202
"method": "btree",
31313203
"with": {}
3204+
},
3205+
"messages_search_idx": {
3206+
"name": "messages_search_idx",
3207+
"columns": [
3208+
{
3209+
"expression": "to_tsvector('simple', coalesce(\"subject\", '') || ' ' || coalesce(\"text_body\", ''))",
3210+
"asc": true,
3211+
"isExpression": true,
3212+
"nulls": "last"
3213+
}
3214+
],
3215+
"isUnique": false,
3216+
"concurrently": false,
3217+
"method": "gin",
3218+
"with": {}
31323219
}
31333220
},
31343221
"foreignKeys": {

‎drizzle/meta/_journal.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{
66
"idx": 0,
77
"version": "7",
8-
"when": 1790525848449,
8+
"when": 1790535774750,
99
"tag": "0000_init",
1010
"breakpoints": true
1111
}

‎package.json‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
{
22
"name": "dispatch",
3-
"version": "0.1.0",
3+
"version": "1.0.0",
4+
"description": "The open-source collaborative inbox for teams — shared Gmail & IMAP inboxes, internal comments, assignments and automation.",
5+
"license": "AGPL-3.0-only",
6+
"homepage": "https://github.com/codextde/dispatch",
7+
"repository": {
8+
"type": "git",
9+
"url": "https://github.com/codextde/dispatch.git"
10+
},
411
"private": true,
512
"scripts": {
613
"dev": "next dev",
@@ -40,7 +47,6 @@
4047
"cmdk": "^1.1.1",
4148
"date-fns": "^4.4.0",
4249
"drizzle-orm": "^0.45.3",
43-
"embla-carousel-react": "^8.6.0",
4450
"frimousse": "^0.4.0",
4551
"geist": "^1.7.2",
4652
"html-to-text": "^10.0.1",

‎pnpm-lock.yaml‎

Lines changed: 0 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/app/invite/[token]/page.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* eslint-disable @next/next/no-img-element -- workspace logos are user-provided URLs/uploads, not optimizable assets */
12
import type { Metadata } from "next"
23
import Link from "next/link"
34
import { redirect } from "next/navigation"

‎src/components/app/user-menu.tsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
"use client"
22

3+
/* eslint-disable @next/next/no-img-element -- workspace logos are user-provided URLs/uploads, not optimizable assets */
4+
35
import Link from "next/link"
46
import { useTheme } from "next-themes"
57
import { Check, ChevronsUpDown, LogOut, Monitor, Moon, Plus, Settings, Shield, Sun, User } from "lucide-react"

‎src/components/auth/login-form.tsx‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ export function LoginForm({
4242
const [redirecting, setRedirecting] = useState(false)
4343
const [pending, startTransition] = useTransition()
4444
const emailRef = useRef<HTMLInputElement>(null)
45+
const codeRef = useRef<HTMLInputElement>(null)
4546

4647
useEffect(() => {
4748
if (cooldown <= 0) return
@@ -81,6 +82,13 @@ export function LoginForm({
8182
})
8283
}
8384

85+
// The code field is disabled while the send transition settles, so `autoFocus`
86+
// alone misses it: focus it as soon as it becomes interactive (and after errors).
87+
const codeInteractive = step === "code" && !pending && !redirecting
88+
useEffect(() => {
89+
if (codeInteractive) codeRef.current?.focus()
90+
}, [codeInteractive, error])
91+
8492
if (step === "code") {
8593
return (
8694
<div>
@@ -116,6 +124,7 @@ export function LoginForm({
116124
6-digit code
117125
</Label>
118126
<InputOTP
127+
ref={codeRef}
119128
id="login-code"
120129
maxLength={6}
121130
value={code}

‎src/components/onboarding/pending-invitations.tsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
"use client"
22

3+
/* eslint-disable @next/next/no-img-element -- workspace logos are user-provided URLs/uploads, not optimizable assets */
4+
35
import { useState, useTransition } from "react"
46
import { toast } from "sonner"
57
import { ArrowRight } from "lucide-react"

‎src/hooks/use-mobile.ts‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
import * as React from "react"
22

33
const MOBILE_BREAKPOINT = 768
4+
const QUERY = `(max-width: ${MOBILE_BREAKPOINT - 1}px)`
45

5-
export function useIsMobile() {
6-
const [isMobile, setIsMobile] = React.useState<boolean | undefined>(undefined)
7-
8-
React.useEffect(() => {
9-
const mql = window.matchMedia(`(max-width: ${MOBILE_BREAKPOINT - 1}px)`)
10-
const onChange = () => {
11-
setIsMobile(window.innerWidth < MOBILE_BREAKPOINT)
12-
}
13-
mql.addEventListener("change", onChange)
14-
setIsMobile(window.innerWidth < MOBILE_BREAKPOINT)
15-
return () => mql.removeEventListener("change", onChange)
16-
}, [])
6+
function subscribe(onChange: () => void) {
7+
const mql = window.matchMedia(QUERY)
8+
mql.addEventListener("change", onChange)
9+
return () => mql.removeEventListener("change", onChange)
10+
}
1711

18-
return !!isMobile
12+
/** True below the `md` breakpoint (768px). Server render assumes desktop. */
13+
export function useIsMobile() {
14+
return React.useSyncExternalStore(
15+
subscribe,
16+
() => window.matchMedia(QUERY).matches,
17+
() => false
18+
)
1919
}

0 commit comments

Comments
 (0)