From c043c472f28623f61fe95b2066a491a1668fe2c7 Mon Sep 17 00:00:00 2001 From: qinluhe Date: Wed, 10 Jul 2024 13:19:13 +0800 Subject: [PATCH] fix: add link to login --- .../setting/about/about_setting_group.dart | 4 ++-- .../widgets/sign_in_agreement.dart | 15 +++++++++--- .../js-services/cache/__tests__/cache.test.ts | 6 ++--- .../services/tauri-services/index.ts | 24 +++++++++++++++++++ 4 files changed, 41 insertions(+), 8 deletions(-) diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/setting/about/about_setting_group.dart b/frontend/appflowy_flutter/lib/mobile/presentation/setting/about/about_setting_group.dart index 337ce2549da4f..d4f0766626b9f 100644 --- a/frontend/appflowy_flutter/lib/mobile/presentation/setting/about/about_setting_group.dart +++ b/frontend/appflowy_flutter/lib/mobile/presentation/setting/about/about_setting_group.dart @@ -25,14 +25,14 @@ class AboutSettingGroup extends StatelessWidget { trailing: const Icon( Icons.chevron_right, ), - onTap: () => afLaunchUrlString('https://appflowy.io/privacy/app'), + onTap: () => afLaunchUrlString('https://appflowy.io/privacy'), ), MobileSettingItem( name: LocaleKeys.settings_mobile_termsAndConditions.tr(), trailing: const Icon( Icons.chevron_right, ), - onTap: () => afLaunchUrlString('https://appflowy.io/terms/app'), + onTap: () => afLaunchUrlString('https://appflowy.io/terms'), ), if (kDebugMode) MobileSettingItem( diff --git a/frontend/appflowy_flutter/lib/user/presentation/screens/sign_in_screen/widgets/sign_in_agreement.dart b/frontend/appflowy_flutter/lib/user/presentation/screens/sign_in_screen/widgets/sign_in_agreement.dart index fc1d9501bc59f..18d6ad2c63974 100644 --- a/frontend/appflowy_flutter/lib/user/presentation/screens/sign_in_screen/widgets/sign_in_agreement.dart +++ b/frontend/appflowy_flutter/lib/user/presentation/screens/sign_in_screen/widgets/sign_in_agreement.dart @@ -1,7 +1,10 @@ import 'package:appflowy/generated/locale_keys.g.dart'; import 'package:easy_localization/easy_localization.dart'; +import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; +import 'package:appflowy/core/helpers/url_launcher.dart'; + class SignInAgreement extends StatelessWidget { const SignInAgreement({ super.key, @@ -20,15 +23,21 @@ class SignInAgreement extends StatelessWidget { TextSpan( text: '${LocaleKeys.web_termOfUse.tr()} ', style: const TextStyle(color: Colors.blue, fontSize: 12), + mouseCursor: SystemMouseCursors.click, + recognizer: TapGestureRecognizer() + ..onTap = () => afLaunchUrlString('https://appflowy.io/terms'), ), TextSpan( text: '${LocaleKeys.web_and.tr()} ', style: const TextStyle(color: Colors.grey, fontSize: 12), ), TextSpan( - text: LocaleKeys.web_privacyPolicy.tr(), - style: const TextStyle(color: Colors.blue, fontSize: 12), - ), + text: LocaleKeys.web_privacyPolicy.tr(), + style: const TextStyle(color: Colors.blue, fontSize: 12), + mouseCursor: SystemMouseCursors.click, + recognizer: TapGestureRecognizer() + ..onTap = + () => afLaunchUrlString('https://appflowy.io/privacy')), ], ), ); diff --git a/frontend/appflowy_web_app/src/application/services/js-services/cache/__tests__/cache.test.ts b/frontend/appflowy_web_app/src/application/services/js-services/cache/__tests__/cache.test.ts index fae533182f7e1..d49ddcab39157 100644 --- a/frontend/appflowy_web_app/src/application/services/js-services/cache/__tests__/cache.test.ts +++ b/frontend/appflowy_web_app/src/application/services/js-services/cache/__tests__/cache.test.ts @@ -9,6 +9,7 @@ import { } from '@/application/services/js-services/cache'; import { openCollabDB, db } from '@/application/db'; import { StrategyType } from '@/application/services/js-services/cache/types'; +import * as Y from 'yjs'; jest.mock('@/application/ydoc/apply', () => ({ applyYDoc: jest.fn(), @@ -118,9 +119,8 @@ describe('Cache functions', () => { describe('getBatchCollabs', () => { it('should return empty array when no cache found', async () => { - (openCollabDB as jest.Mock).mockResolvedValue(undefined); - const collabs = await getBatchCollabs(['1', '2', '3']); - expect(collabs).toEqual([]); + (openCollabDB as jest.Mock).mockResolvedValue(new Y.Doc()); + await expect(getBatchCollabs(['1', '2', '3'])).rejects.toThrow('No cache found'); }); it('should return collabs when cache found', async () => { diff --git a/frontend/appflowy_web_app/src/application/services/tauri-services/index.ts b/frontend/appflowy_web_app/src/application/services/tauri-services/index.ts index 8e81f4ed5ffaf..36f178cc57ed7 100644 --- a/frontend/appflowy_web_app/src/application/services/tauri-services/index.ts +++ b/frontend/appflowy_web_app/src/application/services/tauri-services/index.ts @@ -21,4 +21,28 @@ export class AFClientService implements AFService { async getPublishDatabaseViewRows(_namespace: string, _publishName: string, _rowIds: string[]) { return Promise.reject('Method not implemented'); } + + getClientId(): string { + return ''; + } + + loginAuth(_: string): Promise { + return Promise.resolve(undefined); + } + + signInDiscord(_params: { redirectTo: string }): Promise { + return Promise.resolve(undefined); + } + + signInGithub(_params: { redirectTo: string }): Promise { + return Promise.resolve(undefined); + } + + signInGoogle(_params: { redirectTo: string }): Promise { + return Promise.resolve(undefined); + } + + signInMagicLink(_params: { email: string; redirectTo: string }): Promise { + return Promise.resolve(undefined); + } }