diff --git a/frontend/appflowy_web_app/src/application/services/js-services/cache/index.ts b/frontend/appflowy_web_app/src/application/services/js-services/cache/index.ts index 712e903c6b..83d8226603 100644 --- a/frontend/appflowy_web_app/src/application/services/js-services/cache/index.ts +++ b/frontend/appflowy_web_app/src/application/services/js-services/cache/index.ts @@ -258,10 +258,9 @@ export async function revalidatePublishView< // rowMapDoc.getMap().set(subdoc.guid, subdoc); // }); } - - console.log('rows', rows); } + console.log('====', rows); const state = new Uint8Array(data); applyYDoc(collab, state); diff --git a/frontend/appflowy_web_app/src/components/app/AppTheme.tsx b/frontend/appflowy_web_app/src/components/app/AppTheme.tsx index 329617b8ce..5b81148b0b 100644 --- a/frontend/appflowy_web_app/src/components/app/AppTheme.tsx +++ b/frontend/appflowy_web_app/src/components/app/AppTheme.tsx @@ -15,7 +15,7 @@ function AppTheme({ children }: { children: React.ReactNode }) { createTheme({ typography: { fontFamily: ['inherit'].join(','), - fontSize: 12, + fontSize: 14, button: { textTransform: 'none', }, diff --git a/frontend/appflowy_web_app/src/components/database/board/Board.tsx b/frontend/appflowy_web_app/src/components/database/board/Board.tsx index a92ae8c705..73c0f95398 100644 --- a/frontend/appflowy_web_app/src/components/database/board/Board.tsx +++ b/frontend/appflowy_web_app/src/components/database/board/Board.tsx @@ -7,7 +7,6 @@ export function Board() { const database = useDatabase(); const groups = useGroupsSelector(); - console.log('groups', database); if (!database) { return (
diff --git a/frontend/appflowy_web_app/src/components/database/calendar/Calendar.tsx b/frontend/appflowy_web_app/src/components/database/calendar/Calendar.tsx index 6a710ab655..96e8238c6b 100644 --- a/frontend/appflowy_web_app/src/components/database/calendar/Calendar.tsx +++ b/frontend/appflowy_web_app/src/components/database/calendar/Calendar.tsx @@ -8,7 +8,7 @@ export function Calendar() { const { dayPropGetter, localizer, formats, events, emptyEvents } = useCalendarSetup(); return ( -
+
, diff --git a/frontend/appflowy_web_app/src/components/database/calendar/calendar.scss b/frontend/appflowy_web_app/src/components/database/calendar/calendar.scss index bbba46f82e..eacc97482a 100644 --- a/frontend/appflowy_web_app/src/components/database/calendar/calendar.scss +++ b/frontend/appflowy_web_app/src/components/database/calendar/calendar.scss @@ -15,6 +15,7 @@ $today-highlight-bg: transparent; .rbc-date-cell, .rbc-header { min-width: 97px; + font-size: 14px; } .rbc-date-cell.rbc-now { @@ -78,6 +79,10 @@ $today-highlight-bg: transparent; height: fit-content; table-layout: fixed; width: 100%; + + &:last-child { + margin-bottom: 150px; + } } .event-properties { diff --git a/frontend/appflowy_web_app/src/components/database/components/board/column/Column.tsx b/frontend/appflowy_web_app/src/components/database/components/board/column/Column.tsx index 831aa24f34..bedf5088d0 100644 --- a/frontend/appflowy_web_app/src/components/database/components/board/column/Column.tsx +++ b/frontend/appflowy_web_app/src/components/database/components/board/column/Column.tsx @@ -71,7 +71,7 @@ export const Column = memo( return (
-
{header}
+
{header}
@@ -79,6 +79,7 @@ export const Column = memo( return ( - setOpen(true)} > {`${t('calendar.settings.noDateTitle')} (${emptyEvents.length})`} - + ); } diff --git a/frontend/appflowy_web_app/src/components/database/components/calendar/toolbar/Toolbar.tsx b/frontend/appflowy_web_app/src/components/database/components/calendar/toolbar/Toolbar.tsx index 9b8f41d398..f63014253a 100644 --- a/frontend/appflowy_web_app/src/components/database/components/calendar/toolbar/Toolbar.tsx +++ b/frontend/appflowy_web_app/src/components/database/components/calendar/toolbar/Toolbar.tsx @@ -23,7 +23,7 @@ export function Toolbar({ return (
-
{dateStr}
+
{dateStr}
onNavigate('PREV')}> diff --git a/frontend/appflowy_web_app/src/components/database/components/cell/checkbox/CheckboxCell.tsx b/frontend/appflowy_web_app/src/components/database/components/cell/checkbox/CheckboxCell.tsx index 9ffe88ee3f..e3bf897953 100644 --- a/frontend/appflowy_web_app/src/components/database/components/cell/checkbox/CheckboxCell.tsx +++ b/frontend/appflowy_web_app/src/components/database/components/cell/checkbox/CheckboxCell.tsx @@ -10,7 +10,7 @@ export function CheckboxCell({ cell, style }: CellProps) { return (
- {checked ? : } + {checked ? : }
); } diff --git a/frontend/appflowy_web_app/src/components/database/components/grid/grid-cell/GridCell.tsx b/frontend/appflowy_web_app/src/components/database/components/grid/grid-cell/GridCell.tsx index 5840109be7..0090f1361c 100644 --- a/frontend/appflowy_web_app/src/components/database/components/grid/grid-cell/GridCell.tsx +++ b/frontend/appflowy_web_app/src/components/database/components/grid/grid-cell/GridCell.tsx @@ -53,7 +53,7 @@ export function GridCell({ onResize, rowId, fieldId, columnIndex, rowIndex }: Gr if (!field) return null; return ( -
+
); diff --git a/frontend/appflowy_web_app/src/components/database/components/grid/grid-column/GridColumn.tsx b/frontend/appflowy_web_app/src/components/database/components/grid/grid-column/GridColumn.tsx index 7f022aa34a..f4d01f61db 100644 --- a/frontend/appflowy_web_app/src/components/database/components/grid/grid-column/GridColumn.tsx +++ b/frontend/appflowy_web_app/src/components/database/components/grid/grid-column/GridColumn.tsx @@ -26,11 +26,11 @@ export function GridColumn({ column, index }: { column: Column; index: number }) borderLeftWidth: index === 0 ? 0 : 1, }} className={ - 'flex h-full w-full items-center overflow-hidden whitespace-nowrap border-t border-b border-l border-line-divider px-1.5 text-xs font-medium hover:bg-fill-list-active' + 'flex h-full w-full items-center gap-1 overflow-hidden whitespace-nowrap border-t border-b border-l border-line-divider px-2 text-sm font-medium hover:bg-fill-list-active' } >
- +
{name}
{isAIField && } diff --git a/frontend/appflowy_web_app/src/components/database/components/grid/grid-table/GridTable.tsx b/frontend/appflowy_web_app/src/components/database/components/grid/grid-table/GridTable.tsx index d439681b21..8cd294d234 100644 --- a/frontend/appflowy_web_app/src/components/database/components/grid/grid-table/GridTable.tsx +++ b/frontend/appflowy_web_app/src/components/database/components/grid/grid-table/GridTable.tsx @@ -126,7 +126,7 @@ export const GridTable = ({ scrollLeft, columnWidth, columns, onScrollLeft }: Gr columnCount={columns.length} columnWidth={(index) => columnWidth(index, width)} rowHeight={rowHeight} - className={'grid-table pb-6'} + className={'grid-table pb-[150px]'} overscanRowCount={5} overscanColumnCount={5} style={{ diff --git a/frontend/appflowy_web_app/src/components/database/components/tabs/ViewTabs.tsx b/frontend/appflowy_web_app/src/components/database/components/tabs/ViewTabs.tsx index a9c58e42c7..64faab7949 100644 --- a/frontend/appflowy_web_app/src/components/database/components/tabs/ViewTabs.tsx +++ b/frontend/appflowy_web_app/src/components/database/components/tabs/ViewTabs.tsx @@ -12,7 +12,7 @@ export const ViewTabs = styled((props: TabsProps) => )({ export const ViewTab = styled((props: TabProps) => )({ padding: '0 12px', minHeight: '24px', - fontSize: '12px', + fontSize: '14px', minWidth: 'unset', margin: '4px 0', borderRadius: 0, diff --git a/frontend/appflowy_web_app/src/components/editor/components/leaf/mention/MentionPage.tsx b/frontend/appflowy_web_app/src/components/editor/components/leaf/mention/MentionPage.tsx index cdf4f46f62..f839e6f9bb 100644 --- a/frontend/appflowy_web_app/src/components/editor/components/leaf/mention/MentionPage.tsx +++ b/frontend/appflowy_web_app/src/components/editor/components/leaf/mention/MentionPage.tsx @@ -7,17 +7,16 @@ import { useTranslation } from 'react-i18next'; function MentionPage({ pageId }: { pageId: string }) { const context = useEditorContext(); - const { navigateToView, loadViewMeta, loadView } = context; + const { navigateToView, loadViewMeta } = context; const [unPublished, setUnPublished] = useState(false); const [meta, setMeta] = useState(null); useEffect(() => { void (async () => { - if (loadViewMeta && loadView) { + if (loadViewMeta) { setUnPublished(false); try { - await loadView(pageId); - const meta = await loadViewMeta(pageId); + const meta = await loadViewMeta(pageId, setMeta); setMeta(meta); } catch (e) { @@ -25,7 +24,7 @@ function MentionPage({ pageId }: { pageId: string }) { } } })(); - }, [loadViewMeta, pageId, loadView]); + }, [loadViewMeta, pageId]); const icon = useMemo(() => { return meta?.icon; diff --git a/frontend/appflowy_web_app/src/pages/AfterPaymentPage.tsx b/frontend/appflowy_web_app/src/pages/AfterPaymentPage.tsx index 7395045088..beece2661c 100644 --- a/frontend/appflowy_web_app/src/pages/AfterPaymentPage.tsx +++ b/frontend/appflowy_web_app/src/pages/AfterPaymentPage.tsx @@ -1,10 +1,16 @@ -import { openOrDownload } from '@/components/publish/header/utils'; import { Button, Typography } from '@mui/material'; -import React from 'react'; +import React, { useCallback, useEffect } from 'react'; import { ReactComponent as Logo } from '@/assets/logo.svg'; import { ReactComponent as AppflowyLogo } from '@/assets/appflowy.svg'; function AfterPaymentPage() { + const openAppFlowy = useCallback(() => { + window.open(`appflowy-flutter://payment-success/${window.location.search || ''}`, '_self'); + }, []); + + useEffect(() => { + openAppFlowy(); + }, [openAppFlowy]); return (
@@ -24,7 +30,7 @@ function AfterPaymentPage() {