Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR: Implement the new profile creation screen #37

Merged
merged 5 commits into from
Oct 22, 2023
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion app.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,15 @@
"output": "static",
"favicon": "./assets/images/favicon.png"
},
"plugins": ["expo-router"],
"plugins": [
"expo-router",
[
"expo-barcode-scanner",
{
"cameraPermission": "Allow Senso to access camera."
}
]
],
"experiments": {
"tsconfigPaths": true
}
Expand Down
3 changes: 2 additions & 1 deletion app/auth/login.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import {
import { POST } from "@/common/api";
import { useI18n } from "@/common/i18n";
import { useIdentity, RedirectIfLoggedIn } from "@/common/identity";
import { AppRoutes } from "@/common/util/constants";
import { Header } from "@/components/Header";

const Page = () => {
Expand Down Expand Up @@ -120,7 +121,7 @@ const Page = () => {
</Button>
<Text style={styles.submit}>
{t("login.registerPrompt")}{" "}
<Link href="/auth/register" replace>
<Link href={AppRoutes.Register} replace>
<Text style={{ color: theme.colors.primary }}>
{t("login.registerButton")}
</Text>
Expand Down
3 changes: 2 additions & 1 deletion app/auth/register.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import {
import { POST } from "@/common/api";
import { useI18n } from "@/common/i18n";
import { useIdentity, RedirectIfLoggedIn } from "@/common/identity";
import { AppRoutes } from "@/common/util/constants";
import { Header } from "@/components/Header";

interface IRegisterForm {
Expand Down Expand Up @@ -196,7 +197,7 @@ const Page = () => {
</Button>
<Text style={styles.submit}>
{t("register.loginPrompt")}{" "}
<Link href="/auth/login" replace>
<Link href={AppRoutes.Login} replace>
<Text style={{ color: theme.colors.primary }}>
{t("register.loginButton")}
</Text>
Expand Down
5 changes: 3 additions & 2 deletions app/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { ActivityIndicator, Button, Text } from "react-native-paper";
import { BASE_URL, useApi } from "@/common/api";
import { useI18n } from "@/common/i18n";
import { useIdentity, RedirectIfLoggedIn } from "@/common/identity";
import { AppRoutes } from "@/common/util/constants";
import { Header } from "@/components/Header";
import { MonoText } from "@/components/StyledText";

Expand Down Expand Up @@ -44,7 +45,7 @@ export const Landing = ({ debug = false }: { debug?: boolean }) => {
{error?.toString()}
</MonoText>
{/* Escape hatch to let us test client without server in development */}
<Link href="/auth/login" replace>
<Link href={AppRoutes.Login} replace>
<Button textColor="red">IGNORE</Button>
</Link>
</>
Expand All @@ -62,7 +63,7 @@ export const Landing = ({ debug = false }: { debug?: boolean }) => {
<Text variant="displayMedium">{t("appName")}</Text>

<Text style={styles.description}>{t("landing.description")}</Text>
<Link href="/auth/login" replace>
<Link href={AppRoutes.Login} replace>
<Button mode="contained" labelStyle={styles.button}>
{t("landing.startButton")}
</Button>
Expand Down
66 changes: 0 additions & 66 deletions app/profile/add.tsx

This file was deleted.

47 changes: 47 additions & 0 deletions app/profile/caretaker/add.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
import { Link } from "expo-router";
import { StyleSheet, View } from "react-native";
import { Button, Text } from "react-native-paper";

import { actions } from "@/common/actions";
import { useI18n } from "@/common/i18n";
import { AppRoutes } from "@/common/util/constants";
import { Header } from "@/components/Header";

const AddCaretakerProfile = () => {
const { t } = useI18n();

return (
<View style={styles.container}>
<Header
left={actions.goBack}
title={t("createCaretakerProfile.pageTitle")}
/>
<Text variant="titleLarge" style={styles.description}>
{t("createCaretakerProfile.description")}
</Text>
<Link href={AppRoutes.ScanSeniorQR}>
<Button labelStyle={styles.skipButton}>Scan QR code</Button>
kubaczerwinski77 marked this conversation as resolved.
Show resolved Hide resolved
</Link>
</View>
);
};

const styles = StyleSheet.create({
container: {
flex: 1,
alignItems: "center",
justifyContent: "center",
marginVertical: 16,
marginHorizontal: 24,
gap: 32,
},
description: {
textAlign: "center",
},
skipButton: {
fontSize: 20,
lineHeight: 28,
},
});

export default AddCaretakerProfile;
70 changes: 70 additions & 0 deletions app/profile/caretaker/scanQR.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
import { BarCodeScanner } from "expo-barcode-scanner";
import { router } from "expo-router";
import React, { useState, useEffect } from "react";
import { Text, View, StyleSheet, Alert } from "react-native";

import { actions } from "@/common/actions";
import { useI18n } from "@/common/i18n";
import { Header } from "@/components/Header";

export default function App() {
const { t } = useI18n();

const [hasPermission, setHasPermission] = useState<boolean | null>(null);
const [scanned, setScanned] = useState(false);

useEffect(() => {
const getBarCodeScannerPermissions = async () => {
const { status } = await BarCodeScanner.requestPermissionsAsync();
setHasPermission(status === "granted");
};

getBarCodeScannerPermissions();
}, []);

const handleBarCodeScanned = ({ type, data }: { type: any; data: any }) => {
setScanned(true);
Alert.alert("QR code scanned!", "Do you want to add this senior?", [
kubaczerwinski77 marked this conversation as resolved.
Show resolved Hide resolved
{
text: "Cancel",
style: "cancel",
onPress: () => setScanned(false),
},
{
text: "Add",
onPress: () => {
router.back();
setScanned(false);
},
},
]);
};

if (hasPermission === null) {
return <Text>Requesting for camera permission</Text>;
}
if (hasPermission === false) {
return <Text>No access to camera</Text>;
kubaczerwinski77 marked this conversation as resolved.
Show resolved Hide resolved
}

return (
<View style={styles.container}>
<Header
left={actions.goBack}
title={t("createSeniorProfile.pageTitle")}
/>
<BarCodeScanner
onBarCodeScanned={scanned ? undefined : handleBarCodeScanned}
style={StyleSheet.absoluteFillObject}
/>
</View>
);
}

const styles = StyleSheet.create({
container: {
flex: 1,
flexDirection: "column",
justifyContent: "center",
},
});
17 changes: 13 additions & 4 deletions app/profile/list.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@ import {
useIdentity,
RedirectIfLoggedOut,
} from "@/common/identity";
import { AppRoutes } from "@/common/util/constants";
import { Header } from "@/components/Header";

const mockApiResponse = {
profiles: [
{ type: "caretaker", seniorId: 2137, seniorAlias: "Jan Kowalski" },
{ type: "caretaker", seniorId: 123, seniorAlias: "Grzegorz Floryda" },
{ type: "senior", seniorId: 789 },
// { type: "senior", seniorId: 789 },
kubaczerwinski77 marked this conversation as resolved.
Show resolved Hide resolved
] as Profile[],
};

Expand Down Expand Up @@ -95,11 +96,18 @@ const ProfilesList = () => {
</List.Subheader>
)}
<View style={styles.newProfileButtonWrapper}>
<Link href="/profile/add">
<Button icon="plus" mode="contained" uppercase>
{t("profileList.newProfileButton")}
<Link href={AppRoutes.AddCaretakerProfile}>
<Button icon="account-eye-outline" mode="outlined" uppercase>
{t("profileList.newCaretakerProfileButton")}
</Button>
</Link>
{!seniorProfile && (
<Link href={AppRoutes.AddSeniorProfile} replace>
<Button icon="plus" mode="contained" uppercase>
{t("profileList.newSeniorProfileButton")}
</Button>
</Link>
)}
</View>
</View>
);
Expand Down Expand Up @@ -139,6 +147,7 @@ const styles = StyleSheet.create({
},
newProfileButtonWrapper: {
alignItems: "center",
gap: 16,
},
});

Expand Down
55 changes: 55 additions & 0 deletions app/profile/senior/add.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
import { Link } from "expo-router";
import { StyleSheet, View } from "react-native";
import { Button, Text } from "react-native-paper";

import { actions } from "@/common/actions";
import { useI18n } from "@/common/i18n";
import { AppRoutes } from "@/common/util/constants";
import { Header } from "@/components/Header";

const ProfilesList = () => {
const { t } = useI18n();

return (
<View style={styles.container}>
<Header
left={actions.goBack}
title={t("createSeniorProfile.pageTitle")}
/>
<Text variant="titleLarge" style={styles.description}>
{t("createSeniorProfile.description")}
</Text>
<View style={styles.mockQR} />
<Link href={AppRoutes.Dashboard} replace>
<Button labelStyle={styles.skipButton}>
{t("createSeniorProfile.skipButton")}
</Button>
</Link>
</View>
);
};

const styles = StyleSheet.create({
container: {
flex: 1,
alignItems: "center",
justifyContent: "center",
marginVertical: 16,
marginHorizontal: 24,
gap: 32,
},
description: {
textAlign: "center",
},
mockQR: {
width: "90%",
aspectRatio: 1,
backgroundColor: "black",
},
skipButton: {
fontSize: 20,
lineHeight: 28,
},
});

export default ProfilesList;
Loading