Skip to content

Commit

Permalink
feat(#49): User Story: As a new rider, I want to provide my personal …
Browse files Browse the repository at this point in the history
…information to create an account.

- fixes on shared components
  • Loading branch information
chriscoderdr committed Nov 6, 2024
1 parent 0101831 commit 163cb1c
Show file tree
Hide file tree
Showing 9 changed files with 84 additions and 37 deletions.
16 changes: 8 additions & 8 deletions apps/rider-app/app/(tabs)/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ import {
StyleSheet,
View
} from 'react-native';
import {
LoginForm,
ScrollableFormContainer
} from 'react-native-morro-taxi-rn-components';

export default function HomeScreen() {
return (
<View>
<SafeAreaView>
<KeyboardAvoidingView>
<ScrollView>
<RideRequestForm />
</ScrollView>
</KeyboardAvoidingView>
</SafeAreaView>
<View style={{flex: 1}}>
<ScrollableFormContainer>
<LoginForm />
</ScrollableFormContainer>
</View>
);
}
Expand Down
29 changes: 29 additions & 0 deletions packages/morro-taxi-rn-components/src/components/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import Checkbox from './checkbox';
import GenericCard from './generic-card';
import InputPhone from './input-phone';
import InputText from './input-text';
import InputTextField from './input-text-field';
import KeyboardDismiss from './keyboard-dismiss';
import LoginForm from './login-form';
import ObscuredInputText from './obscured-input-text';
import PermissionBlocker from './permission-blocker';
import RoundedButton from './rounded-button';
import ScrollableFormContainer from './scrollable-form-container';
import SignUpForm from './sign-up-form';
import TestComponent from './test-component';

export {
Checkbox,
GenericCard,
InputPhone,
InputText,
InputTextField,
KeyboardDismiss,
LoginForm,
ObscuredInputText,
PermissionBlocker,
RoundedButton,
ScrollableFormContainer,
SignUpForm,
TestComponent,
};
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import InputPhone from '@/src/components/input-phone';
import InputText from '@/src/components/input-text';
import ObscuredInputText from '@/src/components/obscured-input-text';
import InputPhone from '../input-phone';
import InputText from '..//input-text';
import ObscuredInputText from '../obscured-input-text';
import { forwardRef } from 'react';
import { Text, View } from 'react-native';
import { IInputTextFieldProps } from './props';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { IInputTextProps } from '@/src/components/input-text/props';
import { IInputTextProps } from '../input-text/props';

export interface IInputTextFieldProps extends IInputTextProps {
label: string;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import InputTextField from '@/src/components/input-text-field';
import RoundedButton from '@/src/components/rounded-button';
import InputTextField from '../input-text-field';
import RoundedButton from '../rounded-button';

import { isValidEmail, isValidPassword } from '@/src/utils/validators';
import { isValidEmail, isValidPassword } from '../../utils/validators';

import React, { useState } from 'react';
import { Alert, Keyboard, Text, View } from 'react-native';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
import InputText from "@/src/components/input-text";
import { IInputTextProps } from "@/src/components/input-text/props";
import { AntDesign } from "@expo/vector-icons";
import React, { useState } from "react";
import InputText from '..//input-text';
import { IInputTextProps } from '../input-text/props';
import { AntDesign } from '@expo/vector-icons';
import React, { useState } from 'react';

interface IObscuredInputTextProps extends IInputTextProps {}

const ObscuredInputText: React.FC<IObscuredInputTextProps> = ({
const ObscuredInputText: React.FC<IInputTextProps> = ({
...inputTextProps
}) => {
const [isTextHidden, setIsTextHidden] = useState(true);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import KeyboardDismiss from '@/src/components/keyboard-dismiss';
import KeyboardDismiss from '../keyboard-dismiss';
import { KeyboardAvoidingView, Platform, StyleSheet, View } from 'react-native';
import { ScrollView } from 'react-native';
import { SafeAreaView } from 'react-native-safe-area-context';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import Checkbox from '@/src/components/checkbox';
import InputTextField from '@/src/components/input-text-field';
import RoundedButton from '@/src/components/rounded-button';
import Checkbox from '../checkbox';
import InputTextField from '../input-text-field';
import RoundedButton from '../rounded-button';
import {
isValidEmail,
isValidName,
isValidPassword,
isValidPhone,
} from '@/src/utils/validators';
} from '../../utils/validators';
import React, { useRef, useState } from 'react';
import { Alert, Keyboard, Text, View } from 'react-native';
import { styles } from './styles';
Expand Down Expand Up @@ -72,7 +72,7 @@ const SignUpForm: React.FC = () => {

if (isValid && isChecked) {
try {
// TODO: call parent component to handle sign up
// TODO: call parent component to handle sign up
} catch (err: any) {
const errorMessage =
err?.data?.error || 'Registration failed. Please try again.';
Expand Down Expand Up @@ -233,7 +233,7 @@ const SignUpForm: React.FC = () => {
<RoundedButton
disabled={isButtonDisabled()}
// text={isLoading ? 'Signing Up...' : 'Sign Up'}
text='Sign up'
text="Sign up"
onPress={handleSignUp}
testID="signup-button"
/>
Expand Down
36 changes: 28 additions & 8 deletions packages/morro-taxi-rn-components/src/index.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,30 @@
import TestComponent from "./components/test-component";
import Checkbox from "./components/checkbox";
import GenericCard from "./components/generic-card";
import InputPhone from "./components/input-phone";
import InputText from "./components/input-text";
import InputTextField from "./components/input-text-field";
import KeyboardDismiss from "./components/keyboard-dismiss";
import LoginForm from "./components/login-form";
import ObscuredInputText from "./components/obscured-input-text";
import PermissionBlocker from "./components/permission-blocker";
import RoundedButton from "./components/rounded-button";
import ScrollableFormContainer from "./components/scrollable-form-container";
import SignUpForm from "./components/sign-up-form";

import InputText from './components/input-text';

export function multiply(a: number, b: number): Promise<number> {
return Promise.resolve(a * b);
}

export { InputText, TestComponent };

export {
TestComponent,
Checkbox,
GenericCard,
InputPhone,
InputText,
InputTextField,
KeyboardDismiss,
LoginForm,
ObscuredInputText,
PermissionBlocker,
RoundedButton,
ScrollableFormContainer,
SignUpForm,
};

0 comments on commit 163cb1c

Please sign in to comment.