mokhtar/shellphone.app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

get rid of onboarding requirements

Browse Source
This commit is contained in:
m5r
2021-10-16 00:24:28 +02:00
parent c8f707af9c
commit 3cc6f35071
33 changed files with 291 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/messages/components/empty-messages.tsx
View File

@ -19,7 +19,7 @@ export default function EmptyMessages() {
<div className="mt-6">
<button
type="button"
className="inline-flex items-center px-4 py-2 border border-transparent shadow-sm text-sm font-medium rounded-md text-white bg-[#007AFF] focus:outline-none focus:ring-2 focus:ring-offset-2"
className="inline-flex items-center px-4 py-2 border border-transparent shadow-sm text-sm font-medium rounded-md text-white bg-primary-500 focus:outline-none focus:ring-2 focus:ring-offset-2"
onClick={openNewMessageArea}
>
<IoCreateOutline className="-ml-1 mr-2 h-5 w-5" aria-hidden="true" />

23
app/messages/pages/messages.tsx
View File

@ -4,14 +4,16 @@ import type { BlitzPage } from "blitz";
import { Routes } from "blitz";
import { atom, useAtom } from "jotai";
import Layout from "../../core/layouts/layout";
import Layout from "app/core/layouts/layout";
import ConversationsList from "../components/conversations-list";
import NewMessageButton from "../components/new-message-button";
import useRequireOnboarding from "../../core/hooks/use-require-onboarding";
import useNotifications from "../../core/hooks/use-notifications";
import MissingTwilioCredentials from "app/core/components/missing-twilio-credentials";
import useNotifications from "app/core/hooks/use-notifications";
import useCurrentUser from "app/core/hooks/use-current-user";
import PageTitle from "../../core/components/page-title";
const Messages: BlitzPage = () => {
useRequireOnboarding();
const { hasFilledTwilioCredentials } = useCurrentUser();
const { subscription, subscribe } = useNotifications();
const setIsOpen = useAtom(bottomSheetOpenAtom)[1];
@ -21,11 +23,18 @@ const Messages: BlitzPage = () => {
}
}, [subscribe, subscription]);
if (!hasFilledTwilioCredentials) {
return (
<>
<MissingTwilioCredentials />
<PageTitle className="filter blur-sm absolute top-0" title="Messages" />
</>
);
}
return (
<>
<div className="flex flex-col space-y-6 p-3">
<h2 className="text-3xl font-bold">Messages</h2>
</div>
<PageTitle title="Messages" />
<section className="flex flex-grow flex-col">
<Suspense fallback="Loading...">
<ConversationsList />

3
app/messages/pages/messages/[recipient].tsx
View File

@ -5,12 +5,9 @@ import { IoChevronBack, IoInformationCircle, IoCall } from "react-icons/io5";
import Layout from "../../../core/layouts/layout";
import Conversation from "../../components/conversation";
import useRequireOnboarding from "../../../core/hooks/use-require-onboarding";
import useConversation from "../../hooks/use-conversation";
const ConversationPage: BlitzPage = () => {
useRequireOnboarding();
const router = useRouter();
const recipient = decodeURIComponent(router.params.recipient);
const pageTitle = `Messages with ${recipient}`;

5
app/messages/queries/get-conversations.ts
View File

@ -22,12 +22,11 @@ export default resolver.pipe(
where: { id: organizationId },
include: { phoneNumbers: true },
});
if (!organization) {
if (!organization || !organization.phoneNumbers[0]) {
throw new NotFoundError();
}
const phoneNumberId = organization.phoneNumbers[0]!.id;
const phoneNumberId = organization.phoneNumbers[0].id;
const processingState = await db.processingPhoneNumber.findFirst({ where: { organizationId, phoneNumberId } });
if (processingState && !processingState.hasFetchedMessages) {
return;