Skip to content

Commit

Permalink
fix(core): ai related copywritting fix (#6766)
Browse files Browse the repository at this point in the history
  • Loading branch information
CatsJuice authored and pull[bot] committed Jul 24, 2024
1 parent fbc2416 commit 03c371e
Show file tree
Hide file tree
Showing 5 changed files with 71 additions and 7 deletions.
4 changes: 4 additions & 0 deletions packages/frontend/component/src/ui/layout/wrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export type FlexWrapperProps = {
wrap?: boolean;
flexShrink?: CSSProperties['flexShrink'];
flexGrow?: CSSProperties['flexGrow'];
gap?: CSSProperties['gap'];
};

// Sometimes we just want to wrap a component with a div to set flex or other styles, but we don't want to create a new component for it.
Expand Down Expand Up @@ -88,6 +89,7 @@ export const FlexWrapper = styled(Wrapper, {
'flexDirection',
'flexShrink',
'flexGrow',
'gap',
].includes(prop as string);
},
})<FlexWrapperProps>(({
Expand All @@ -97,6 +99,7 @@ export const FlexWrapper = styled(Wrapper, {
flexDirection,
flexShrink,
flexGrow,
gap,
}) => {
return {
display: 'flex',
Expand All @@ -106,6 +109,7 @@ export const FlexWrapper = styled(Wrapper, {
flexDirection,
flexShrink,
flexGrow,
gap,
};
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,15 @@ export const thumbContent = style({
width: 'calc(100% + 4px)',
height: 'calc(100% + 4px)',
});

export const actionButton = style({
fontWeight: 500,
fontSize: cssVar('fontSm'),
lineHeight: '22px',
});
export const getStartedButtonText = style({
color: cssVar('textSecondaryColor'),
});
export const purchaseButtonText = style({
color: cssVar('textPrimaryColor'),
});
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { notify } from '@affine/component';
import { Button, FlexWrapper, notify } from '@affine/component';
import { openSettingModalAtom } from '@affine/core/atoms';
import { SubscriptionService } from '@affine/core/modules/cloud';
import { WorkspaceFlavour } from '@affine/env/workspace';
import { useAFFiNEI18N } from '@affine/i18n/hooks';
import { AiIcon } from '@blocksuite/icons';
Expand All @@ -10,10 +11,10 @@ import {
WorkspaceService,
} from '@toeverything/infra';
import { cssVar } from '@toeverything/theme';
import { useAtomValue } from 'jotai';
import { useAtomValue, useSetAtom } from 'jotai';
import Lottie from 'lottie-react';
import { useTheme } from 'next-themes';
import { useEffect, useMemo, useRef } from 'react';
import { useCallback, useEffect, useMemo, useRef } from 'react';

import * as styles from './edgeless.dialog.css';
import mouseTrackDark from './lottie/edgeless/mouse-track-dark.json';
Expand Down Expand Up @@ -47,22 +48,34 @@ const EdgelessOnboardingAnimation = () => {
export const AIOnboardingEdgeless = ({
onDismiss,
}: BaseAIOnboardingDialogProps) => {
const { workspaceService, docService } = useServices({
const { workspaceService, docService, subscriptionService } = useServices({
WorkspaceService,
DocService,
SubscriptionService,
});

const t = useAFFiNEI18N();
const notifyId = useLiveData(edgelessNotifyId$);
const generalAIOnboardingOpened = useLiveData(showAIOnboardingGeneral$);
const aiSubscription = useLiveData(subscriptionService.subscription.ai$);
const settingModalOpen = useAtomValue(openSettingModalAtom);
const timeoutRef = useRef<ReturnType<typeof setTimeout>>();
const isCloud =
workspaceService.workspace.flavour === WorkspaceFlavour.AFFINE_CLOUD;

const setSettingModal = useSetAtom(openSettingModalAtom);

const doc = docService.doc;
const mode = useLiveData(doc.mode$);

const goToPricingPlans = useCallback(() => {
setSettingModal({
open: true,
activeTab: 'plans',
scrollAnchor: 'aiPricingPlan',
});
}, [setSettingModal]);

useEffect(() => {
if (settingModalOpen.open) return;
if (generalAIOnboardingOpened) return;
Expand All @@ -83,13 +96,46 @@ export const AIOnboardingEdgeless = ({
thumb: <EdgelessOnboardingAnimation />,
alignMessage: 'icon',
onDismiss,
footer: (
<FlexWrapper marginTop={8} justifyContent="flex-end" gap="12px">
<Button
onClick={() => {
notify.dismiss(id);
onDismiss();
}}
type="plain"
className={styles.actionButton}
>
<span className={styles.getStartedButtonText}>
{t['com.affine.ai-onboarding.edgeless.get-started']()}
</span>
</Button>
{aiSubscription ? null : (
<Button
className={styles.actionButton}
type="plain"
onClick={() => {
goToPricingPlans();
notify.dismiss(id);
onDismiss();
}}
>
<span className={styles.purchaseButtonText}>
{t['com.affine.ai-onboarding.edgeless.purchase']()}
</span>
</Button>
)}
</FlexWrapper>
),
},
{ duration: 1000 * 60 * 10 }
);
edgelessNotifyId$.next(id);
}, 1000);
}, [
aiSubscription,
generalAIOnboardingOpened,
goToPricingPlans,
isCloud,
mode,
notifyId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ export const AIOnboardingGeneral = ({
a: (
<a
className={styles.privacyLink}
href="https://ai.affine.pro"
href="https://affine.pro/terms"
/>
),
}}
Expand Down
6 changes: 4 additions & 2 deletions packages/frontend/i18n/src/resources/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -909,7 +909,7 @@
"com.affine.payment.billing-setting.upgrade": "Upgrade",
"com.affine.payment.billing-setting.view-invoice": "View Invoice",
"com.affine.payment.billing-setting.year": "year",
"com.affine.payment.billing-setting.ai.free-desc": "Yue are current on the <a>Free plan</a>.",
"com.affine.payment.billing-setting.ai.free-desc": "You are current on the <a>Free plan</a>.",
"com.affine.payment.billing-setting.ai.purchase": "Purchase",
"com.affine.payment.blob-limit.description.local": "The maximum file upload size for local workspaces is {{quota}}.",
"com.affine.payment.blob-limit.description.member": "The maximum file upload size for this joined workspace is {{quota}}. You can contact the owner of this workspace.",
Expand Down Expand Up @@ -1306,8 +1306,10 @@
"com.affine.ai-onboarding.local.message": "Lets you think bigger, create faster, work smarter and save time for every project.",
"com.affine.ai-onboarding.local.action-dismiss": "Dismiss",
"com.affine.ai-onboarding.local.action-learn-more": "Learn More",
"com.affine.ai-onboarding.edgeless.title": "Meet AFFiNE AI",
"com.affine.ai-onboarding.edgeless.title": "Right-clicking to select content AI",
"com.affine.ai-onboarding.edgeless.message": "Lets you think bigger, create faster, work smarter and save time for every project.",
"com.affine.ai-onboarding.edgeless.get-started": "Get Started",
"com.affine.ai-onboarding.edgeless.purchase": "Upgrade to Unlimited Usage",
"com.affine.ai.login-required.dialog-title": "Sign in to Continue",
"com.affine.ai.login-required.dialog-content": "To use AFFiNE AI, please sign in to your AFFiNE Cloud account.",
"com.affine.ai.login-required.dialog-confirm": "Sign in",
Expand Down

0 comments on commit 03c371e

Please sign in to comment.