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

[auth] Style settings screen #46

Merged
merged 11 commits into from
Dec 3, 2023
Merged
Show file tree
Hide file tree
Changes from all 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
24 changes: 20 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@mui/material": "^5.14.13",
"@mui/styled-engine-sc": "^6.0.0-alpha.1",
"@mui/system": "^5.14.13",
"@react-native-async-storage/async-storage": "^1.18.2",
"@react-native-async-storage/async-storage": "1.18.2",
"@react-native-community/datetimepicker": "7.2.0",
"@react-navigation/bottom-tabs": "^6.5.9",
"@react-navigation/material-bottom-tabs": "^6.2.17",
Expand All @@ -42,6 +42,7 @@
"react": "18.2.0",
"react-native": "0.72.6",
"react-native-dom-parser": "^1.5.3",
"react-native-element-dropdown": "^2.10.0",
"react-native-elements": "^3.4.3",
"react-native-gesture-handler": "~2.12.0",
"react-native-htmlview": "^0.16.0",
Expand All @@ -55,10 +56,9 @@
"react-native-screens": "~3.22.0",
"react-native-svg": "13.9.0",
"react-native-url-polyfill": "^2.0.0",
"validator": "^13.11.0",
"react-native-vector-icons": "^10.0.2",
"react-scroll-to-top": "^3.0.0",
"expo-font": "~11.4.0"
"validator": "^13.11.0"
},
"devDependencies": {
"@babel/core": "^7.20.0",
Expand Down
4 changes: 2 additions & 2 deletions src/app/auth/login/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import { SafeAreaView } from 'react-native-safe-area-context';
import validator from 'validator';

import styles from './styles';
import StyledButton from '../../../components/StyledButton/StyledButton';
import UserStringInput from '../../../components/UserStringInput/UserStringInput';
import { isEmailUsed, queryEmailByUsername } from '../../../queries/auth';
import globalStyles from '../../../styles/globalStyles';
import { useSession } from '../../../utils/AuthContext';
import StyledButton from '../../../components/StyledButton/StyledButton';
import UserStringInput from '../../../components/UserStringInput/UserStringInput';

function LoginScreen() {
const sessionHandler = useSession();
Expand Down
2 changes: 1 addition & 1 deletion src/app/auth/onboarding/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import { Alert, ScrollView, Platform } from 'react-native';
import { Button } from 'react-native-elements';

import styles from './styles';
import StyledButton from '../../../components/StyledButton/StyledButton';
import UserStringInput from '../../../components/UserStringInput/UserStringInput';
import { useSession } from '../../../utils/AuthContext';
import supabase from '../../../utils/supabase';
import StyledButton from '../../../components/StyledButton/StyledButton';

function OnboardingScreen() {
const { session } = useSession();
Expand Down
6 changes: 3 additions & 3 deletions src/app/auth/signup/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ function SignUpScreen() {
const [password, setPassword] = useState('');
const [passwordTextHidden, setPasswordTextHidden] = useState(true);
const [loading, setLoading] = useState(false);
let lastUsernameCheck = useRef(Date.now());
const lastUsernameCheck = useRef(Date.now());
const validUsernameCharacters = /^\w+$/g;

const [passwordComplexity, setPasswordComplexity] = useState(false);
Expand Down Expand Up @@ -295,8 +295,8 @@ function SignUpScreen() {
disabled={
!passwordComplexity ||
loading ||
emailError != '' ||
usernameError != '' ||
emailError !== '' ||
usernameError !== '' ||
email.length === 0 ||
username.length === 0
}
Expand Down
188 changes: 0 additions & 188 deletions src/app/settings.tsx

This file was deleted.

11 changes: 11 additions & 0 deletions src/app/settings/_layout.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { Stack } from 'expo-router';

function StackLayout() {
return (
<Stack>
<Stack.Screen name="index" options={{ headerShown: false }} />
</Stack>
);
}

export default StackLayout;
Loading