aboutsummaryrefslogtreecommitdiffstats
path: root/apps/mobile
diff options
context:
space:
mode:
Diffstat (limited to 'apps/mobile')
-rw-r--r--apps/mobile/app/_layout.tsx1
-rw-r--r--apps/mobile/app/dashboard/_layout.tsx2
-rw-r--r--apps/mobile/app/index.tsx2
-rw-r--r--apps/mobile/app/server-address.tsx87
-rw-r--r--apps/mobile/app/signin.tsx70
5 files changed, 53 insertions, 109 deletions
diff --git a/apps/mobile/app/_layout.tsx b/apps/mobile/app/_layout.tsx
index b2688388..e1751f1e 100644
--- a/apps/mobile/app/_layout.tsx
+++ b/apps/mobile/app/_layout.tsx
@@ -55,7 +55,6 @@ export default function RootLayout() {
title: "",
}}
/>
- <Stack.Screen name="server-address" />
<Stack.Screen name="sharing" />
<Stack.Screen
name="test-connection"
diff --git a/apps/mobile/app/dashboard/_layout.tsx b/apps/mobile/app/dashboard/_layout.tsx
index e9c28c90..c7f3dc19 100644
--- a/apps/mobile/app/dashboard/_layout.tsx
+++ b/apps/mobile/app/dashboard/_layout.tsx
@@ -27,7 +27,7 @@ export default function Dashboard() {
const isLoggedIn = useIsLoggedIn();
useEffect(() => {
if (isLoggedIn !== undefined && !isLoggedIn) {
- return router.replace("server-address");
+ return router.replace("signin");
}
}, [isLoggedIn]);
diff --git a/apps/mobile/app/index.tsx b/apps/mobile/app/index.tsx
index 702269a5..dbbea97e 100644
--- a/apps/mobile/app/index.tsx
+++ b/apps/mobile/app/index.tsx
@@ -11,6 +11,6 @@ export default function App() {
} else if (isLoggedIn) {
return <Redirect href="dashboard" />;
} else {
- return <Redirect href="server-address" />;
+ return <Redirect href="signin" />;
}
}
diff --git a/apps/mobile/app/server-address.tsx b/apps/mobile/app/server-address.tsx
deleted file mode 100644
index c34806b3..00000000
--- a/apps/mobile/app/server-address.tsx
+++ /dev/null
@@ -1,87 +0,0 @@
-import { useState } from "react";
-import {
- Keyboard,
- KeyboardAvoidingView,
- Platform,
- Pressable,
- Text,
- TouchableWithoutFeedback,
- View,
-} from "react-native";
-import { Redirect, useRouter } from "expo-router";
-import Logo from "@/components/Logo";
-import { TailwindResolver } from "@/components/TailwindResolver";
-import { Button, buttonVariants } from "@/components/ui/Button";
-import { Input } from "@/components/ui/Input";
-import useAppSettings from "@/lib/settings";
-import { cn } from "@/lib/utils";
-import { Bug } from "lucide-react-native";
-
-export default function ServerAddress() {
- const router = useRouter();
- const { settings, setSettings } = useAppSettings();
- const [serverAddress, setServerAddress] = useState(settings.address);
-
- if (settings.apiKey) {
- return <Redirect href="dashboard" />;
- }
-
- return (
- <KeyboardAvoidingView
- behavior={Platform.OS === "ios" ? "padding" : "height"}
- >
- <TouchableWithoutFeedback onPress={Keyboard.dismiss}>
- <View className="flex h-full flex-col justify-center gap-2 px-4">
- <View className="items-center">
- <TailwindResolver
- className="color-foreground"
- comp={(styles) => (
- <Logo
- height={150}
- width={200}
- fill={styles?.color?.toString()}
- />
- )}
- />
- </View>
- <View className="gap-2">
- <Text className="font-bold">Server Address</Text>
- <Input
- className="w-full"
- placeholder="Server Address"
- value={serverAddress}
- autoCapitalize="none"
- keyboardType="url"
- onChangeText={(e) => {
- setServerAddress(e);
- setSettings({ ...settings, address: e.replace(/\/$/, "") });
- }}
- />
- </View>
- <View className="flex flex-row items-center justify-between gap-2">
- <Button
- className="flex-1"
- label="Next"
- onPress={() => router.push("/signin")}
- />
- <Pressable
- className={cn(
- buttonVariants({ variant: "default" }),
- !settings.address && "bg-gray-500",
- )}
- onPress={() => router.push("/test-connection")}
- disabled={!settings.address}
- >
- <TailwindResolver
- comp={(styles) => (
- <Bug size={20} color={styles?.color?.toString()} />
- )}
- className="text-background"
- />
- </Pressable>
- </View>
- </View>
- </TouchableWithoutFeedback>
- </KeyboardAvoidingView>
- );
-}
diff --git a/apps/mobile/app/signin.tsx b/apps/mobile/app/signin.tsx
index 6119f0f8..bb3e3426 100644
--- a/apps/mobile/app/signin.tsx
+++ b/apps/mobile/app/signin.tsx
@@ -8,13 +8,15 @@ import {
TouchableWithoutFeedback,
View,
} from "react-native";
-import { Redirect } from "expo-router";
+import { Redirect, useRouter } from "expo-router";
import Logo from "@/components/Logo";
import { TailwindResolver } from "@/components/TailwindResolver";
-import { Button } from "@/components/ui/Button";
+import { Button, buttonVariants } from "@/components/ui/Button";
import { Input } from "@/components/ui/Input";
import useAppSettings from "@/lib/settings";
import { api } from "@/lib/trpc";
+import { cn } from "@/lib/utils";
+import { Bug } from "lucide-react-native";
enum LoginType {
Password,
@@ -23,6 +25,7 @@ enum LoginType {
export default function Signin() {
const { settings, setSettings } = useAppSettings();
+ const router = useRouter();
const [error, setError] = useState<string | undefined>();
const [loginType, setLoginType] = useState<LoginType>(LoginType.Password);
@@ -53,7 +56,7 @@ export default function Signin() {
const { mutate: validateApiKey, isPending: apiKeyValueRequestIsPending } =
api.apiKeys.validate.useMutation({
onSuccess: () => {
- setSettings({ ...settings, apiKey: apiFormData.apiKey });
+ setSettings({ ...settings, apiKey: formState.apiKey });
},
onError: (e) => {
if (e.data?.code === "UNAUTHORIZED") {
@@ -64,17 +67,15 @@ export default function Signin() {
},
});
- const [usernameFormData, setUserNameFormData] = useState<{
+ const [formState, setFormState] = useState<{
+ serverAddress: string;
email: string;
password: string;
+ apiKey: string;
}>({
+ serverAddress: "",
email: "",
password: "",
- });
-
- const [apiFormData, setApiFormData] = useState<{
- apiKey: string;
- }>({
apiKey: "",
});
@@ -85,9 +86,13 @@ export default function Signin() {
const onSignin = () => {
if (loginType === LoginType.Password) {
const randStr = (Math.random() + 1).toString(36).substring(5);
- login({ ...usernameFormData, keyName: `Mobile App: (${randStr})` });
+ login({
+ email: formState.email,
+ password: formState.password,
+ keyName: `Mobile App: (${randStr})`,
+ });
} else if (loginType === LoginType.ApiKey) {
- validateApiKey({ apiKey: apiFormData.apiKey });
+ validateApiKey({ apiKey: formState.apiKey });
}
};
@@ -112,6 +117,20 @@ export default function Signin() {
{error && (
<Text className="w-full text-center text-red-500">{error}</Text>
)}
+ <View className="gap-2">
+ <Text className="font-bold">Server Address</Text>
+ <Input
+ className="w-full"
+ placeholder="Server Address"
+ value={formState.serverAddress}
+ autoCapitalize="none"
+ keyboardType="url"
+ onChangeText={(e) => {
+ setFormState((s) => ({ ...s, serverAddress: e }));
+ setSettings({ ...settings, address: e.replace(/\/$/, "") });
+ }}
+ />
+ </View>
{loginType === LoginType.Password && (
<>
<View className="gap-2">
@@ -121,9 +140,9 @@ export default function Signin() {
placeholder="Email"
keyboardType="email-address"
autoCapitalize="none"
- value={usernameFormData.email}
+ value={formState.email}
onChangeText={(e) =>
- setUserNameFormData((s) => ({ ...s, email: e.trim() }))
+ setFormState((s) => ({ ...s, email: e }))
}
/>
</View>
@@ -133,11 +152,11 @@ export default function Signin() {
className="w-full"
placeholder="Password"
secureTextEntry
- value={usernameFormData.password}
+ value={formState.password}
autoCapitalize="none"
textContentType="password"
onChangeText={(e) =>
- setUserNameFormData((s) => ({ ...s, password: e }))
+ setFormState((s) => ({ ...s, password: e }))
}
/>
</View>
@@ -151,12 +170,10 @@ export default function Signin() {
className="w-full"
placeholder="API Key"
secureTextEntry
- value={apiFormData.apiKey}
+ value={formState.apiKey}
autoCapitalize="none"
textContentType="password"
- onChangeText={(e) =>
- setApiFormData((s) => ({ ...s, apiKey: e }))
- }
+ onChangeText={(e) => setFormState((s) => ({ ...s, apiKey: e }))}
/>
</View>
)}
@@ -170,6 +187,21 @@ export default function Signin() {
userNamePasswordRequestIsPending || apiKeyValueRequestIsPending
}
/>
+ <Pressable
+ className={cn(
+ buttonVariants({ variant: "default" }),
+ !settings.address && "bg-gray-500",
+ )}
+ onPress={() => router.push("/test-connection")}
+ disabled={!settings.address}
+ >
+ <TailwindResolver
+ comp={(styles) => (
+ <Bug size={20} color={styles?.color?.toString()} />
+ )}
+ className="text-background"
+ />
+ </Pressable>
</View>
<Pressable onPress={toggleLoginType}>
<Text className="mt-2 text-center text-gray-500">
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2026-01-29 14:59:54 +0000