martin/databag
1
0
Fork 0
mirror of https://github.com/balzack/databag.git synced 2025-03-13 00:50:03 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

cleanup on modal

Browse Source
This commit is contained in:
balzack 2025-02-28 22:45:41 -08:00
parent 7f886813b7
commit ddd93c224d
3 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/client/mobile/package.json
View File

@ -26,7 +26,7 @@
"@types/react-native": "^0.73.0",
"@types/react-native-video": "^5.0.20",
"crypto-js": "^3.3.0",
"databag-client-sdk": "^0.0.22",
"databag-client-sdk": "^0.0.25",
"jsencrypt": "^3.3.2",
"react": "18.3.1",
"react-dom": "^18.3.1",

54
app/client/mobile/src/access/Access.tsx
View File

@ -8,6 +8,7 @@ import {IconButton, Divider, Surface, Text, TextInput, Button, Checkbox} from 'r
import {BlurView} from '@react-native-community/blur';
import {InputCode} from '../utils/InputCode';
import {tos} from '../constants/terms';
import { Confirm } from '../confirm/Confirm';
export function Access() {
const {state, actions} = useAccess();
@ -18,6 +19,17 @@ export function Access() {
const [otp, setOtp] = useState(false);
const [terms, setTerms] = useState(false);
const alertParams = {
title: state.strings.operationFailed,
prompt: state.strings.tryAgain,
cancel: {
label: state.strings.close,
action: () => {
setAlert(false);
},
},
};
const login = async () => {
if (!state.loading) {
actions.setLoading(true);
@ -327,30 +339,23 @@ export function Access() {
)}
</SafeAreaView>
</KeyboardAwareScrollView>
{(alert || otp) && <BlurView style={styles.blur} blurType="dark" blurAmount={2} reducedTransparencyFallbackColor="dark" />}
<Modal visible={alert} onDismiss={() => setAlert(false)} contentContainerStyle={styles.modal}>
<Surface elevation={5} mode="flat" style={styles.content}>
<Text variant="titleLarge">{state.strings.operationFailed}</Text>
<Text variant="titleSmall">{state.strings.tryAgain}</Text>
<Button mode="text" style={styles.close} onPress={() => setAlert(false)}>
{state.strings.close}
</Button>
</Surface>
</Modal>
<Modal visible={otp} onDismiss={() => setOtp(false)} contentContainerStyle={styles.modal}>
<Surface elevation={5} mode="flat" style={styles.content}>
<Text variant="titleLarge">{state.strings.mfaTitle}</Text>
<Text variant="titleSmall">{state.strings.mfaEnter}</Text>
<InputCode onChangeText={actions.setCode} />
<View style={styles.controls}>
<Button mode="outlined" style={styles.submit} onPress={() => setOtp(false)}>
{state.strings.cancel}
</Button>
<Button mode="contained" style={styles.submit} onPress={login} loading={state.loading} disabled={state.code.length !== 6}>
{state.strings.login}
</Button>
</View>
</Surface>
<Modal animationType="fade" transparent={true} supportedOrientations={['portrait', 'landscape']} visible={otp} onRequestClose={() => setOtp(false)}>
<View style={styles.modal}>
<BlurView style={styles.blur} blurType="dark" blurAmount={2} reducedTransparencyFallbackColor="dark" />
<Surface elevation={5} mode="flat" style={styles.content}>
<Text variant="titleLarge">{state.strings.mfaTitle}</Text>
<Text variant="titleSmall">{state.strings.mfaEnter}</Text>
<InputCode onChangeText={actions.setCode} />
<View style={styles.controls}>
<Button mode="outlined" style={styles.submit} onPress={() => setOtp(false)}>
{state.strings.cancel}
</Button>
<Button mode="contained" style={styles.submit} onPress={login} loading={state.loading} disabled={state.code.length !== 6}>
{state.strings.login}
</Button>
</View>
</Surface>
</View>
</Modal>
<Modal animationType="fade" transparent={true} supportedOrientations={['portrait', 'landscape']} visible={terms} onRequestClose={() => setTerms(false)}>
<View style={styles.modal}>
@ -369,6 +374,7 @@ export function Access() {
</Surface>
</View>
</Modal>
<Confirm show={alert} params={alertParams} />
</Surface>
);
}

2
app/client/web/package.json
View File

@ -24,7 +24,7 @@
"@types/react-dom": "18.0.6",
"@vitejs/plugin-react": "4.3.1",
"crypto-js": "^4.2.0",
"databag-client-sdk": "^0.0.20",
"databag-client-sdk": "^0.0.25",
"jest": "29.1.1",
"jsencrypt": "^3.3.2",
"react": "18.3.1",